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

annotate Python/Python-ast.c @ 83867:12cbb5183d98

Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() when applicable.

author	Charles-Francois Natali <cf.natali@gmail.com>
date	Mon, 20 May 2013 19:13:19 +0200
parents	cc7a94efb1b7
children	cf8f42eadbd0

rev	line source
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40819 diff changeset	1 /* File automatically generated by Parser/asdl_c.py. */
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40819 diff changeset	2
75542 3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	3 #include <stddef.h>
3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	4
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	5 #include "Python.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6 #include "Python-ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	8 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	9 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	10 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	11 static PyTypeObject *Module_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	12 _Py_IDENTIFIER(body);
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	13 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	14 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	15 };
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 *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	17 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	18 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	19 };
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	20 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	21 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	22 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	23 };
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	24 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	25 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	26 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	27 };
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	28 static PyTypeObject *stmt_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	29 _Py_IDENTIFIER(lineno);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	30 _Py_IDENTIFIER(col_offset);
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	31 static char *stmt_attributes[] = {
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	32 "lineno",
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	33 "col_offset",
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	34 };
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	35 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	36 static PyTypeObject *FunctionDef_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	37 _Py_IDENTIFIER(name);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	38 _Py_IDENTIFIER(args);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	39 _Py_IDENTIFIER(decorator_list);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	40 _Py_IDENTIFIER(returns);
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	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",
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	45 "decorator_list",
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	46 "returns",
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	47 };
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	48 static PyTypeObject *ClassDef_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	49 _Py_IDENTIFIER(bases);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	50 _Py_IDENTIFIER(keywords);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	51 _Py_IDENTIFIER(starargs);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	52 _Py_IDENTIFIER(kwargs);
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	53 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	54 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	55 "bases",
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	56 "keywords",
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	57 "starargs",
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	58 "kwargs",
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	59 "body",
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	60 "decorator_list",
36660 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 *Return_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	63 _Py_IDENTIFIER(value);
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	64 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	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 *Delete_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	68 _Py_IDENTIFIER(targets);
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	69 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	70 "targets",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	71 };
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	72 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	73 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	74 "targets",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	75 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	76 };
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	77 static PyTypeObject *AugAssign_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	78 _Py_IDENTIFIER(target);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	79 _Py_IDENTIFIER(op);
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	80 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	81 "target",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	82 "op",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	83 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	84 };
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	85 static PyTypeObject *For_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	86 _Py_IDENTIFIER(iter);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	87 _Py_IDENTIFIER(orelse);
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	88 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	89 "target",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	90 "iter",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	91 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	92 "orelse",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	93 };
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	94 static PyTypeObject *While_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	95 _Py_IDENTIFIER(test);
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	96 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	97 "test",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	98 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	99 "orelse",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	100 };
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	101 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	102 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	103 "test",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	104 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	105 "orelse",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	106 };
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	107 static PyTypeObject *With_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	108 _Py_IDENTIFIER(items);
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	109 static char *With_fields[]={
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	110 "items",
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	111 "body",
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	112 };
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	113 static PyTypeObject *Raise_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	114 _Py_IDENTIFIER(exc);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	115 _Py_IDENTIFIER(cause);
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 char *Raise_fields[]={
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	117 "exc",
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	118 "cause",
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	119 };
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	120 static PyTypeObject *Try_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	121 _Py_IDENTIFIER(handlers);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	122 _Py_IDENTIFIER(finalbody);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	123 static char *Try_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	124 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	125 "handlers",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	126 "orelse",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	127 "finalbody",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	128 };
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	129 static PyTypeObject *Assert_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	130 _Py_IDENTIFIER(msg);
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	131 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	132 "test",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	133 "msg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	134 };
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	135 static PyTypeObject *Import_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	136 _Py_IDENTIFIER(names);
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	137 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	138 "names",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	139 };
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	140 static PyTypeObject *ImportFrom_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	141 _Py_IDENTIFIER(module);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	142 _Py_IDENTIFIER(level);
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	143 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	144 "module",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	145 "names",
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	146 "level",
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	147 };
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	148 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	149 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	150 "names",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	151 };
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	152 static PyTypeObject *Nonlocal_type;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	153 static char *Nonlocal_fields[]={
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	154 "names",
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	155 };
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	156 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	157 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	158 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	159 };
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	160 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	161 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	162 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	163 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	164 static char *expr_attributes[] = {
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	165 "lineno",
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	166 "col_offset",
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	167 };
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	168 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	169 static PyTypeObject *BoolOp_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	170 _Py_IDENTIFIER(values);
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	171 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	172 "op",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	173 "values",
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 *BinOp_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	176 _Py_IDENTIFIER(left);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	177 _Py_IDENTIFIER(right);
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	178 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	179 "left",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	180 "op",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	181 "right",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	182 };
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	183 static PyTypeObject *UnaryOp_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	184 _Py_IDENTIFIER(operand);
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	185 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	186 "op",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	187 "operand",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	188 };
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	189 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	190 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	191 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	192 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	193 };
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	194 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	195 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	196 "test",
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	197 "body",
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	198 "orelse",
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	199 };
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	200 static PyTypeObject *Dict_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	201 _Py_IDENTIFIER(keys);
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	202 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	203 "keys",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	204 "values",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	205 };
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	206 static PyTypeObject *Set_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	207 _Py_IDENTIFIER(elts);
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	208 static char *Set_fields[]={
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	209 "elts",
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 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 *ListComp_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	212 _Py_IDENTIFIER(elt);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	213 _Py_IDENTIFIER(generators);
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	214 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	215 "elt",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	216 "generators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	217 };
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	218 static PyTypeObject *SetComp_type;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	219 static char *SetComp_fields[]={
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	220 "elt",
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	221 "generators",
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	222 };
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	223 static PyTypeObject *DictComp_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	224 _Py_IDENTIFIER(key);
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	225 static char *DictComp_fields[]={
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	226 "key",
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	227 "value",
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	228 "generators",
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	229 };
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	230 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	231 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	232 "elt",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	233 "generators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	234 };
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	235 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	236 static char *Yield_fields[]={
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	237 "value",
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	238 };
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	239 static PyTypeObject *YieldFrom_type;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	240 static char *YieldFrom_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	241 "value",
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 *Compare_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	244 _Py_IDENTIFIER(ops);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	245 _Py_IDENTIFIER(comparators);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	246 static 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	247 "left",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	248 "ops",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	249 "comparators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	250 };
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	251 static PyTypeObject *Call_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	252 _Py_IDENTIFIER(func);
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 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	254 "func",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	255 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	256 "keywords",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	257 "starargs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	258 "kwargs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	259 };
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	260 static PyTypeObject *Num_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	261 _Py_IDENTIFIER(n);
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 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	263 "n",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	264 };
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	265 static PyTypeObject *Str_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	266 _Py_IDENTIFIER(s);
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	267 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	268 "s",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	269 };
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	270 static PyTypeObject *Bytes_type;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	271 static char *Bytes_fields[]={
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	272 "s",
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	273 };
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	274 static PyTypeObject *NameConstant_type;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	275 static char *NameConstant_fields[]={
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	276 "value",
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	277 };
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	278 static PyTypeObject *Ellipsis_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	279 static PyTypeObject *Attribute_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	280 _Py_IDENTIFIER(attr);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	281 _Py_IDENTIFIER(ctx);
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	282 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	283 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	284 "attr",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	285 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	286 };
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	287 static PyTypeObject *Subscript_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	288 _Py_IDENTIFIER(slice);
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	289 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	290 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	291 "slice",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	292 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	293 };
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	294 static PyTypeObject *Starred_type;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	295 static char *Starred_fields[]={
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	296 "value",
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	297 "ctx",
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	298 };
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	299 static PyTypeObject *Name_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	300 _Py_IDENTIFIER(id);
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	301 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	302 "id",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	303 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	304 };
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	305 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	306 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	307 "elts",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	308 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	309 };
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	310 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	311 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	312 "elts",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	313 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	314 };
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	315 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	316 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	317 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	318 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	319 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	320 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	321 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	322 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	323 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	324 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	325 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	326 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	327 static PyTypeObject *Slice_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	328 _Py_IDENTIFIER(lower);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	329 _Py_IDENTIFIER(upper);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	330 _Py_IDENTIFIER(step);
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	331 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	332 "lower",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	333 "upper",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	334 "step",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	335 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	336 static PyTypeObject *ExtSlice_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	337 _Py_IDENTIFIER(dims);
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 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	339 "dims",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	340 };
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	341 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	342 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	343 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	344 };
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	345 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	346 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	347 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	348 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	349 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	350 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	351 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	352 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	353 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	354 *FloorDiv_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	355 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	356 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	357 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	358 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	359 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	360 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	361 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	362 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	363 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	364 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	365 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	366 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	367 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	368 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	369 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	370 *USub_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	371 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	372 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	373 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	374 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	375 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	376 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	377 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	378 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	379 *NotIn_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	380 static PyObject* ast2obj_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	381 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	382 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	383 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	384 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	385 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	386 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	387 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	388 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	389 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	390 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	391 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	392 static PyObject* ast2obj_comprehension(void*);
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	393 _Py_IDENTIFIER(ifs);
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	394 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	395 "target",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	396 "iter",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	397 "ifs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	398 };
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	399 static PyTypeObject *excepthandler_type;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	400 static char *excepthandler_attributes[] = {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	401 "lineno",
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	402 "col_offset",
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	403 };
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	404 static PyObject* ast2obj_excepthandler(void*);
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	405 static PyTypeObject *ExceptHandler_type;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	406 _Py_IDENTIFIER(type);
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	407 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	408 "type",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	409 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	410 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	411 };
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	412 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	413 static PyObject* ast2obj_arguments(void*);
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	414 _Py_IDENTIFIER(vararg);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	415 _Py_IDENTIFIER(kwonlyargs);
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	416 _Py_IDENTIFIER(kw_defaults);
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	417 _Py_IDENTIFIER(kwarg);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	418 _Py_IDENTIFIER(defaults);
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	419 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	420 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	421 "vararg",
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	422 "kwonlyargs",
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	423 "kw_defaults",
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	424 "kwarg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	425 "defaults",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	426 };
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	427 static PyTypeObject *arg_type;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	428 static PyObject* ast2obj_arg(void*);
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	429 static char *arg_attributes[] = {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	430 "lineno",
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	431 "col_offset",
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	432 };
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	433 _Py_IDENTIFIER(arg);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	434 _Py_IDENTIFIER(annotation);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	435 static char *arg_fields[]={
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	436 "arg",
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	437 "annotation",
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	438 };
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	439 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	440 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	441 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	442 "arg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	443 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	444 };
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	445 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	446 static PyObject* ast2obj_alias(void*);
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	447 _Py_IDENTIFIER(asname);
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	448 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	449 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	450 "asname",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	451 };
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	452 static PyTypeObject *withitem_type;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	453 static PyObject* ast2obj_withitem(void*);
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	454 _Py_IDENTIFIER(context_expr);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	455 _Py_IDENTIFIER(optional_vars);
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	456 static char *withitem_fields[]={
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	457 "context_expr",
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	458 "optional_vars",
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	459 };
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	460
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	461
75542 3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	462 typedef struct {
75567 6bee4eea1efa Try to fix compilation of Python-ast.c on Visual Studio 2008 Victor Stinner <victor.stinner@gmail.com> parents: 75542 diff changeset	463 PyObject_HEAD
75542 3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	464 PyObject *dict;
3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	465 } AST_object;
3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	466
75686 9e7f6ddc0d76 free AST's dict Benjamin Peterson <benjamin@python.org> parents: 75567 diff changeset	467 static void
9e7f6ddc0d76 free AST's dict Benjamin Peterson <benjamin@python.org> parents: 75567 diff changeset	468 ast_dealloc(AST_object *self)
9e7f6ddc0d76 free AST's dict Benjamin Peterson <benjamin@python.org> parents: 75567 diff changeset	469 {
9e7f6ddc0d76 free AST's dict Benjamin Peterson <benjamin@python.org> parents: 75567 diff changeset	470 Py_CLEAR(self->dict);
77998 048d8d9aecf1 Issue #15291: Fix a memory leak where AST nodes where not properly deallocated. Antoine Pitrou <solipsis@pitrou.net> parents: 76964 diff changeset	471 Py_TYPE(self)->tp_free(self);
75686 9e7f6ddc0d76 free AST's dict Benjamin Peterson <benjamin@python.org> parents: 75567 diff changeset	472 }
9e7f6ddc0d76 free AST's dict Benjamin Peterson <benjamin@python.org> parents: 75567 diff changeset	473
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	474 static int
78006 85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	475 ast_traverse(AST_object self, visitproc visit, void arg)
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	476 {
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	477 Py_VISIT(self->dict);
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	478 return 0;
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	479 }
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	480
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	481 static void
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	482 ast_clear(AST_object *self)
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	483 {
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	484 Py_CLEAR(self->dict);
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	485 }
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	486
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	487 static int
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	488 ast_type_init(PyObject self, PyObject args, PyObject *kw)
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	489 {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	490 _Py_IDENTIFIER(_fields);
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	491 Py_ssize_t i, numfields = 0;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	492 int res = -1;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	493 PyObject key, value, *fields;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	494 fields = _PyObject_GetAttrId((PyObject*)Py_TYPE(self), &PyId__fields);
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	495 if (!fields)
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	496 PyErr_Clear();
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	497 if (fields) {
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	498 numfields = PySequence_Size(fields);
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	499 if (numfields == -1)
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	500 goto cleanup;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	501 }
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	502 res = 0; /* if no error occurs, this stays 0 to the end */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	503 if (PyTuple_GET_SIZE(args) > 0) {
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	504 if (numfields != PyTuple_GET_SIZE(args)) {
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	505 PyErr_Format(PyExc_TypeError, "%.400s constructor takes %s"
49139 6ae2d4b507a2 Merged revisions 66377 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	506 "%zd positional argument%s",
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	507 Py_TYPE(self)->tp_name,
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	508 numfields == 0 ? "" : "either 0 or ",
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	509 numfields, numfields == 1 ? "" : "s");
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	510 res = -1;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	511 goto cleanup;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	512 }
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	513 for (i = 0; i < PyTuple_GET_SIZE(args); i++) {
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	514 /* cannot be reached when fields is NULL */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	515 PyObject *name = PySequence_GetItem(fields, i);
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	516 if (!name) {
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	517 res = -1;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	518 goto cleanup;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	519 }
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	520 res = PyObject_SetAttr(self, name, PyTuple_GET_ITEM(args, i));
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	521 Py_DECREF(name);
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	522 if (res < 0)
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	523 goto cleanup;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	524 }
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	525 }
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	526 if (kw) {
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	527 i = 0; /* needed by PyDict_Next */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	528 while (PyDict_Next(kw, &i, &key, &value)) {
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	529 res = PyObject_SetAttr(self, key, value);
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	530 if (res < 0)
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	531 goto cleanup;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	532 }
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	533 }
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	534 cleanup:
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	535 Py_XDECREF(fields);
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	536 return res;
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	537 }
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	538
46233 61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	539 /* Pickling support */
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	540 static PyObject *
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	541 ast_type_reduce(PyObject self, PyObject unused)
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	542 {
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	543 PyObject *res;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	544 _Py_IDENTIFIER(__dict__);
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	545 PyObject *dict = _PyObject_GetAttrId(self, &PyId___dict__);
46233 61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	546 if (dict == NULL) {
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	547 if (PyErr_ExceptionMatches(PyExc_AttributeError))
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	548 PyErr_Clear();
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	549 else
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	550 return NULL;
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	551 }
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	552 if (dict) {
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	553 res = Py_BuildValue("O()O", Py_TYPE(self), dict);
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	554 Py_DECREF(dict);
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	555 return res;
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	556 }
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	557 return Py_BuildValue("O()", Py_TYPE(self));
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	558 }
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	559
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	560 static PyMethodDef ast_type_methods[] = {
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	561 {"__reduce__", ast_type_reduce, METH_NOARGS, NULL},
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	562 {NULL}
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	563 };
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	564
75542 3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	565 static PyGetSetDef ast_type_getsets[] = {
3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	566 {"__dict__", PyObject_GenericGetDict, PyObject_GenericSetDict},
3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	567 {NULL}
3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	568 };
3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	569
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	570 static PyTypeObject AST_type = {
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	571 PyVarObject_HEAD_INIT(&PyType_Type, 0)
46233 61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	572 "_ast.AST",
75542 3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	573 sizeof(AST_object),
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	574 0,
75686 9e7f6ddc0d76 free AST's dict Benjamin Peterson <benjamin@python.org> parents: 75567 diff changeset	575 (destructor)ast_dealloc, /* tp_dealloc */
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	576 0, /* tp_print */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	577 0, /* tp_getattr */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	578 0, /* tp_setattr */
51270 debd14c489b9 Issue #1717: rename tp_compare to tp_reserved. I'll change the Mark Dickinson <dickinsm@gmail.com> parents: 50076 diff changeset	579 0, /* tp_reserved */
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	580 0, /* tp_repr */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	581 0, /* tp_as_number */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	582 0, /* tp_as_sequence */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	583 0, /* tp_as_mapping */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	584 0, /* tp_hash */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	585 0, /* tp_call */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	586 0, /* tp_str */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	587 PyObject_GenericGetAttr, /* tp_getattro */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	588 PyObject_GenericSetAttr, /* tp_setattro */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	589 0, /* tp_as_buffer */
78006 85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	590 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	591 0, /* tp_doc */
78006 85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	592 (traverseproc)ast_traverse, /* tp_traverse */
85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	593 (inquiry)ast_clear, /* tp_clear */
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	594 0, /* tp_richcompare */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	595 0, /* tp_weaklistoffset */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	596 0, /* tp_iter */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	597 0, /* tp_iternext */
46233 61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	598 ast_type_methods, /* tp_methods */
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	599 0, /* tp_members */
75542 3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	600 ast_type_getsets, /* tp_getset */
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	601 0, /* tp_base */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	602 0, /* tp_dict */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	603 0, /* tp_descr_get */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	604 0, /* tp_descr_set */
75542 3877bf2e3235 give the AST class a __dict__ Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	605 offsetof(AST_object, dict),/* tp_dictoffset */
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	606 (initproc)ast_type_init, /* tp_init */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	607 PyType_GenericAlloc, /* tp_alloc */
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	608 PyType_GenericNew, /* tp_new */
78006 85cccc38d01c add gc support to the AST base type (closes #15293) Benjamin Peterson <benjamin@python.org> parents: 77998 diff changeset	609 PyObject_GC_Del, /* tp_free */
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	610 };
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	611
07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	612
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	613 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	614 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	615 PyObject fnames, result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	616 int i;
46233 61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	617 fnames = PyTuple_New(num_fields);
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	618 if (!fnames) return NULL;
61c92923cf7f Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46231 diff changeset	619 for (i = 0; i < num_fields; i++) {
42816 872c7c3f0af3 Use unicode for AST attributes Neal Norwitz <nnorwitz@gmail.com> parents: 42206 diff changeset	620 PyObject *field = PyUnicode_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	621 if (!field) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	622 Py_DECREF(fnames);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	623 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	624 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	625 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	626 }
62155 600c23127207 Issue #8848: U / U# formats of Py_BuildValue() are just alias to s / s# Victor Stinner <victor.stinner@haypocalc.com> parents: 57676 diff changeset	627 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	628 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	629 Py_DECREF(fnames);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	630 return (PyTypeObject*)result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	631 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	632
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	633 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	634 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	635 int i, result;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	636 _Py_IDENTIFIER(_attributes);
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	637 PyObject s, l = PyTuple_New(num_fields);
62566 504c499e8c95 Merged revisions 81465-81466,81468,81679,81735,81760,81868,82183 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 62464 diff changeset	638 if (!l)
504c499e8c95 Merged revisions 81465-81466,81468,81679,81735,81760,81868,82183 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 62464 diff changeset	639 return 0;
504c499e8c95 Merged revisions 81465-81466,81468,81679,81735,81760,81868,82183 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 62464 diff changeset	640 for (i = 0; i < num_fields; i++) {
42816 872c7c3f0af3 Use unicode for AST attributes Neal Norwitz <nnorwitz@gmail.com> parents: 42206 diff changeset	641 s = PyUnicode_FromString(attrs[i]);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	642 if (!s) {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	643 Py_DECREF(l);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	644 return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	645 }
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	646 PyTuple_SET_ITEM(l, i, s);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	647 }
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	648 result = _PyObject_SetAttrId((PyObject*)type, &PyId__attributes, l) >= 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	649 Py_DECREF(l);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	650 return result;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	651 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	652
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	653 /* Conversion AST -> Python */
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	654
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	655 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	656 {
76964 c18a1a82bb07 use Py_ssize_t for ast sequence lengths Benjamin Peterson <benjamin@python.org> parents: 76948 diff changeset	657 Py_ssize_t i, n = asdl_seq_LEN(seq);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	658 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	659 PyObject *value;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	660 if (!result)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	661 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	662 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	663 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	664 if (!value) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	665 Py_DECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	666 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	667 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	668 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	669 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	670 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	671 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	672
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	673 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	674 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	675 if (!o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	676 o = Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	677 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	678 return (PyObject*)o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	679 }
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	680 #define ast2obj_singleton ast2obj_object
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	681 #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	682 #define ast2obj_string ast2obj_object
71792 f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	683 #define ast2obj_bytes ast2obj_object
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	684
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	685 static PyObject* ast2obj_int(long b)
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	686 {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43755 diff changeset	687 return PyLong_FromLong(b);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	688 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	689
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	690 /* Conversion Python -> AST */
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	691
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	692 static int obj2ast_singleton(PyObject obj, PyObject* out, PyArena* arena)
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	693 {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	694 if (obj != Py_None && obj != Py_True && obj != Py_False) {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	695 PyErr_SetString(PyExc_ValueError,
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	696 "AST singleton must be True, False, or None");
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	697 return 1;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	698 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	699 *out = obj;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	700 return 0;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	701 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	702
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	703 static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	704 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	705 if (obj == Py_None)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	706 obj = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	707 if (obj)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	708 PyArena_AddPyObject(arena, obj);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	709 Py_XINCREF(obj);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	710 *out = obj;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	711 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	712 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	713
71458 c9ebae3285e3 None is ok for identifiers but not strings Benjamin Peterson <benjamin@python.org> parents: 71455 diff changeset	714 static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
71454 3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	715 {
71458 c9ebae3285e3 None is ok for identifiers but not strings Benjamin Peterson <benjamin@python.org> parents: 71455 diff changeset	716 if (!PyUnicode_CheckExact(obj) && obj != Py_None) {
c9ebae3285e3 None is ok for identifiers but not strings Benjamin Peterson <benjamin@python.org> parents: 71455 diff changeset	717 PyErr_SetString(PyExc_TypeError, "AST identifier must be of type str");
71454 3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	718 return 1;
3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	719 }
3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	720 return obj2ast_object(obj, out, arena);
3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	721 }
3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	722
3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	723 static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	724 {
72154 c8b6d4417274 accept bytes for the AST 'string' type Benjamin Peterson <benjamin@python.org> parents: 71458 diff changeset	725 if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {
71458 c9ebae3285e3 None is ok for identifiers but not strings Benjamin Peterson <benjamin@python.org> parents: 71455 diff changeset	726 PyErr_SetString(PyExc_TypeError, "AST string must be of type str");
c9ebae3285e3 None is ok for identifiers but not strings Benjamin Peterson <benjamin@python.org> parents: 71455 diff changeset	727 return 1;
c9ebae3285e3 None is ok for identifiers but not strings Benjamin Peterson <benjamin@python.org> parents: 71455 diff changeset	728 }
c9ebae3285e3 None is ok for identifiers but not strings Benjamin Peterson <benjamin@python.org> parents: 71455 diff changeset	729 return obj2ast_object(obj, out, arena);
71454 3301689bd78d type check AST strings and identifiers Benjamin Peterson <benjamin@python.org> parents: 68257 diff changeset	730 }
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	731
71792 f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	732 static int obj2ast_bytes(PyObject* obj, PyObject** out, PyArena* arena)
f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	733 {
f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	734 if (!PyBytes_CheckExact(obj)) {
f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	735 PyErr_SetString(PyExc_TypeError, "AST bytes must be of type bytes");
f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	736 return 1;
f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	737 }
f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	738 return obj2ast_object(obj, out, arena);
f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	739 }
f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	740
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	741 static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	742 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	743 int i;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	744 if (!PyLong_Check(obj)) {
73700 470f7d7c57ce Issue #13436: commit regenerated Python-ast.c Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 72154 diff changeset	745 PyErr_Format(PyExc_ValueError, "invalid integer value: %R", obj);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	746 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	747 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	748
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	749 i = (int)PyLong_AsLong(obj);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	750 if (i == -1 && PyErr_Occurred())
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	751 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	752 *out = i;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	753 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	754 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	755
49587 f66688e69f66 Merged revisions 66974,66977,66984,66989,66992,66994-66996,66998-67000,67007,67015 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49583 diff changeset	756 static int add_ast_fields(void)
49583 2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	757 {
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	758 PyObject empty_tuple, d;
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	759 if (PyType_Ready(&AST_type) < 0)
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	760 return -1;
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	761 d = AST_type.tp_dict;
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	762 empty_tuple = PyTuple_New(0);
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	763 if (!empty_tuple \|\|
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	764 PyDict_SetItemString(d, "_fields", empty_tuple) < 0 \|\|
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	765 PyDict_SetItemString(d, "_attributes", empty_tuple) < 0) {
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	766 Py_XDECREF(empty_tuple);
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	767 return -1;
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	768 }
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	769 Py_DECREF(empty_tuple);
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	770 return 0;
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	771 }
2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	772
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	773 static int exists_not_none(PyObject obj, _Py_Identifier id)
c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	774 {
82750 cc7a94efb1b7 bump Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 82747 diff changeset	775 int isnone;
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	776 PyObject *attr = _PyObject_GetAttrId(obj, id);
c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	777 if (!attr) {
c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	778 PyErr_Clear();
c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	779 return 0;
c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	780 }
82750 cc7a94efb1b7 bump Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 82747 diff changeset	781 isnone = attr == Py_None;
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	782 Py_DECREF(attr);
c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	783 return !isnone;
c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	784 }
c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	785
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	786
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	787 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	788 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	789 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	790 if (initialized) return 1;
49583 2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	791 if (add_ast_fields() < 0) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	792 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	793 if (!mod_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	794 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	795 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	796 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	797 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	798 Interactive_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	799 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	800 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	801 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	802 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	803 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	804 if (!Suite_type) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	805 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	806 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	807 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	808 FunctionDef_type = make_type("FunctionDef", stmt_type,
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	809 FunctionDef_fields, 5);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	810 if (!FunctionDef_type) return 0;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	811 ClassDef_type = make_type("ClassDef", stmt_type, ClassDef_fields, 7);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	812 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	813 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	814 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	815 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	816 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	817 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	818 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	819 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	820 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	821 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	822 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	823 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	824 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	825 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	826 if (!If_type) return 0;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	827 With_type = make_type("With", stmt_type, With_fields, 2);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	828 if (!With_type) return 0;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	829 Raise_type = make_type("Raise", stmt_type, Raise_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	830 if (!Raise_type) return 0;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	831 Try_type = make_type("Try", stmt_type, Try_fields, 4);
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	832 if (!Try_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	833 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	834 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	835 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	836 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	837 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	838 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	839 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	840 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	841 if (!Global_type) return 0;
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	842 Nonlocal_type = make_type("Nonlocal", stmt_type, Nonlocal_fields, 1);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	843 if (!Nonlocal_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	844 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	845 if (!Expr_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	846 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	847 if (!Pass_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	848 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	849 if (!Break_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	850 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	851 if (!Continue_type) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	852 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	853 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	854 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	855 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	856 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	857 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	858 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	859 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	860 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	861 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	862 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	863 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	864 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	865 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	866 if (!Dict_type) return 0;
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	867 Set_type = make_type("Set", expr_type, Set_fields, 1);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	868 if (!Set_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	869 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	870 if (!ListComp_type) return 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	871 SetComp_type = make_type("SetComp", expr_type, SetComp_fields, 2);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	872 if (!SetComp_type) return 0;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	873 DictComp_type = make_type("DictComp", expr_type, DictComp_fields, 3);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	874 if (!DictComp_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	875 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	876 GeneratorExp_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	877 if (!GeneratorExp_type) return 0;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	878 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	879 if (!Yield_type) return 0;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	880 YieldFrom_type = make_type("YieldFrom", expr_type, YieldFrom_fields, 1);
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	881 if (!YieldFrom_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	882 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	883 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	884 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	885 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	886 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	887 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	888 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	889 if (!Str_type) return 0;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	890 Bytes_type = make_type("Bytes", expr_type, Bytes_fields, 1);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	891 if (!Bytes_type) return 0;
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	892 NameConstant_type = make_type("NameConstant", expr_type,
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	893 NameConstant_fields, 1);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	894 if (!NameConstant_type) return 0;
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	895 Ellipsis_type = make_type("Ellipsis", expr_type, NULL, 0);
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	896 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	897 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	898 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	899 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	900 if (!Subscript_type) return 0;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	901 Starred_type = make_type("Starred", expr_type, Starred_fields, 2);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	902 if (!Starred_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	903 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	904 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	905 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	906 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	907 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	908 if (!Tuple_type) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	909 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	910 if (!expr_context_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	911 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	912 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	913 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	914 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	915 if (!Load_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	916 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	917 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	918 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	919 if (!Store_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	920 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	921 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	922 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	923 if (!Del_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	924 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	925 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	926 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	927 if (!AugLoad_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	928 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	929 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	930 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	931 if (!AugStore_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	932 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	933 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	934 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	935 if (!Param_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	936 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	937 if (!slice_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	938 if (!add_attributes(slice_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	939 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	940 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	941 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	942 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	943 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	944 if (!Index_type) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	945 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	946 if (!boolop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	947 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	948 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	949 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	950 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	951 if (!And_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	952 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	953 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	954 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	955 if (!Or_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	956 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	957 if (!operator_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	958 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	959 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	960 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	961 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	962 if (!Add_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	963 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	964 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	965 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	966 if (!Sub_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	967 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	968 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	969 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	970 if (!Mult_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	971 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	972 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	973 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	974 if (!Div_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	975 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	976 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	977 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	978 if (!Mod_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	979 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	980 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	981 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	982 if (!Pow_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	983 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	984 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	985 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	986 if (!LShift_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	987 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	988 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	989 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	990 if (!RShift_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	991 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	992 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	993 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	994 if (!BitOr_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	995 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	996 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	997 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	998 if (!BitXor_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	999 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	1000 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	1001 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	1002 if (!BitAnd_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1003 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	1004 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	1005 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	1006 if (!FloorDiv_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	1007 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	1008 if (!unaryop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1009 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	1010 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	1011 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	1012 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	1013 if (!Invert_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1014 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	1015 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	1016 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	1017 if (!Not_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1018 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	1019 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	1020 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	1021 if (!UAdd_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1022 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	1023 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	1024 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	1025 if (!USub_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	1026 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	1027 if (!cmpop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1028 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	1029 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	1030 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	1031 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	1032 if (!Eq_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1033 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	1034 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	1035 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	1036 if (!NotEq_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1037 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	1038 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	1039 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	1040 if (!Lt_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1041 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	1042 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	1043 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	1044 if (!LtE_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1045 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	1046 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	1047 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	1048 if (!Gt_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1049 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	1050 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	1051 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	1052 if (!GtE_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1053 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	1054 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	1055 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	1056 if (!Is_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1057 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	1058 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	1059 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	1060 if (!IsNot_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1061 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	1062 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	1063 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	1064 if (!In_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1065 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	1066 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	1067 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	1068 if (!NotIn_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	1069 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	1070 comprehension_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1071 if (!comprehension_type) return 0;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	1072 if (!add_attributes(comprehension_type, NULL, 0)) return 0;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1073 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	1074 if (!excepthandler_type) return 0;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1075 if (!add_attributes(excepthandler_type, excepthandler_attributes, 2))
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1076 return 0;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1077 ExceptHandler_type = make_type("ExceptHandler", excepthandler_type,
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1078 ExceptHandler_fields, 3);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1079 if (!ExceptHandler_type) return 0;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	1080 arguments_type = make_type("arguments", &AST_type, arguments_fields, 6);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1081 if (!arguments_type) return 0;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	1082 if (!add_attributes(arguments_type, NULL, 0)) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	1083 arg_type = make_type("arg", &AST_type, arg_fields, 2);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1084 if (!arg_type) return 0;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	1085 if (!add_attributes(arg_type, arg_attributes, 2)) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	1086 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	1087 if (!keyword_type) return 0;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	1088 if (!add_attributes(keyword_type, NULL, 0)) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	1089 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	1090 if (!alias_type) return 0;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	1091 if (!add_attributes(alias_type, NULL, 0)) return 0;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	1092 withitem_type = make_type("withitem", &AST_type, withitem_fields, 2);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	1093 if (!withitem_type) return 0;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	1094 if (!add_attributes(withitem_type, NULL, 0)) return 0;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1095 initialized = 1;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1096 return 1;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	1097 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	1098
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1099 static int obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1100 static int obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1101 static int obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1102 static int obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena*
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1103 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1104 static int obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1105 static int obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1106 static int obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1107 static int obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1108 static int obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1109 static int obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena*
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1110 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1111 static int obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena*
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1112 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1113 static int obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1114 static int obj2ast_arg(PyObject* obj, arg_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1115 static int obj2ast_keyword(PyObject* obj, keyword_ty* out, PyArena* arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1116 static int obj2ast_alias(PyObject* obj, alias_ty* out, PyArena* arena);
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	1117 static int obj2ast_withitem(PyObject* obj, withitem_ty* out, PyArena* arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1118
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1119 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	1120 Module(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1121 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1122 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	1123 p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1124 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1125 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1126 p->kind = Module_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1127 p->v.Module.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1128 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1129 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1130
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1131 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	1132 Interactive(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1133 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1134 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	1135 p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1136 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1137 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1138 p->kind = Interactive_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1139 p->v.Interactive.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1140 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1141 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143 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	1144 Expression(expr_ty body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1145 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1146 mod_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1147 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1148 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1149 "field body is required for Expression");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1150 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1151 }
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	1152 p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1153 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1154 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1155 p->kind = Expression_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1156 p->v.Expression.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1157 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1158 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1159
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1160 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	1161 Suite(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1162 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1163 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	1164 p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1165 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1166 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1167 p->kind = Suite_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1168 p->v.Suite.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1169 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1170 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1171
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1172 stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1173 FunctionDef(identifier name, arguments_ty args, asdl_seq * body, asdl_seq *
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	1174 decorator_list, expr_ty returns, int lineno, int col_offset,
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	1175 PyArena *arena)
35742 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 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1178 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1179 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1180 "field name is required for FunctionDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1181 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1182 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1183 if (!args) {
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 args is required for FunctionDef");
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));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 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 = FunctionDef_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1192 p->v.FunctionDef.name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1193 p->v.FunctionDef.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1194 p->v.FunctionDef.body = body;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	1195 p->v.FunctionDef.decorator_list = decorator_list;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1196 p->v.FunctionDef.returns = returns;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1197 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	1198 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1199 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1200 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1201
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1202 stmt_ty
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	1203 ClassDef(identifier name, asdl_seq * bases, asdl_seq * keywords, expr_ty
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	1204 starargs, expr_ty kwargs, asdl_seq * body, asdl_seq * decorator_list,
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	1205 int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1206 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1207 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1208 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1209 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1210 "field name is required for ClassDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1211 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1212 }
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	1213 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1214 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1215 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1216 p->kind = ClassDef_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1217 p->v.ClassDef.name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1218 p->v.ClassDef.bases = bases;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	1219 p->v.ClassDef.keywords = keywords;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	1220 p->v.ClassDef.starargs = starargs;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	1221 p->v.ClassDef.kwargs = kwargs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1222 p->v.ClassDef.body = body;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	1223 p->v.ClassDef.decorator_list = decorator_list;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1224 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	1225 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1226 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1227 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1228
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1229 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	1230 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	1231 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1232 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	1233 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1234 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1235 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1236 p->kind = Return_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1237 p->v.Return.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1238 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	1239 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1240 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1241 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1242
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1243 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1244 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	1245 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1246 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	1247 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1248 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1249 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1250 p->kind = Delete_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1251 p->v.Delete.targets = targets;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1252 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	1253 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1254 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1255 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1256
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1257 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	1258 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	1259 *arena)
35742 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 p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1262 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1263 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1264 "field value is required for Assign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1265 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1266 }
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	1267 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1268 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1269 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1270 p->kind = Assign_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1271 p->v.Assign.targets = targets;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1272 p->v.Assign.value = value;
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 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	1280 col_offset, 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;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1283 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1284 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1285 "field target is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1286 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1287 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1288 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1289 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1290 "field op is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1291 return NULL;
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 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1294 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1295 "field value is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1296 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1297 }
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	1298 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1299 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1300 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1301 p->kind = AugAssign_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1302 p->v.AugAssign.target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1303 p->v.AugAssign.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1304 p->v.AugAssign.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1305 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	1306 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1307 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1308 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1309
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1310 stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1311 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	1312 lineno, int col_offset, PyArena *arena)
35742 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 p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1315 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1316 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1317 "field target is required for For");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1318 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1319 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1320 if (!iter) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1321 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1322 "field iter is required for For");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1323 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1324 }
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	1325 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1326 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1327 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1328 p->kind = For_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1329 p->v.For.target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1330 p->v.For.iter = iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1331 p->v.For.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1332 p->v.For.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1333 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	1334 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1335 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1336 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1337
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1338 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	1339 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	1340 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1341 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1342 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1343 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1344 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1345 "field test is required for While");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1346 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1347 }
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	1348 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1349 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1350 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1351 p->kind = While_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1352 p->v.While.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1353 p->v.While.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1354 p->v.While.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1355 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	1356 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1357 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1358 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1359
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1360 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	1361 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	1362 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1363 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1364 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1365 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1366 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1367 "field test is required for If");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1368 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1369 }
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	1370 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1371 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1372 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1373 p->kind = If_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1374 p->v.If.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1375 p->v.If.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1376 p->v.If.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1377 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	1378 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1379 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1380 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1381
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1382 stmt_ty
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	1383 With(asdl_seq * items, asdl_seq * body, int lineno, int col_offset, PyArena
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	1384 *arena)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1385 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1386 stmt_ty p;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1387 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1388 if (!p)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1389 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1390 p->kind = With_kind;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	1391 p->v.With.items = items;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1392 p->v.With.body = body;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1393 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	1394 p->col_offset = col_offset;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1395 return p;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1396 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1397
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1398 stmt_ty
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	1399 Raise(expr_ty exc, expr_ty cause, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1400 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1401 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	1402 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1403 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1404 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1405 p->kind = Raise_kind;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	1406 p->v.Raise.exc = exc;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	1407 p->v.Raise.cause = cause;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1408 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	1409 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1410 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1411 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1412
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1413 stmt_ty
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1414 Try(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse, asdl_seq *
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1415 finalbody, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1416 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1417 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	1418 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1419 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1420 return NULL;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1421 p->kind = Try_kind;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1422 p->v.Try.body = body;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1423 p->v.Try.handlers = handlers;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1424 p->v.Try.orelse = orelse;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1425 p->v.Try.finalbody = finalbody;
35742 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 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	1433 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1434 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1435 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1436 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1437 "field test is required for Assert");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1438 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1439 }
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	1440 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1441 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1442 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1443 p->kind = Assert_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1444 p->v.Assert.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1445 p->v.Assert.msg = msg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1446 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	1447 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1448 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1449 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1450
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1451 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	1452 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	1453 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1454 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	1455 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1456 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1457 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1458 p->kind = Import_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1459 p->v.Import.names = names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1460 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1461 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1462 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1463 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1464
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1465 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1466 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	1467 col_offset, 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 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	1470 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1471 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1472 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1473 p->kind = ImportFrom_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1474 p->v.ImportFrom.module = module;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1475 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	1476 p->v.ImportFrom.level = level;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1477 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	1478 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1479 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1480 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1481
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1482 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	1483 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	1484 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1485 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	1486 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1487 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1488 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1489 p->kind = Global_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1490 p->v.Global.names = names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1491 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	1492 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1493 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1494 }
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 stmt_ty
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1497 Nonlocal(asdl_seq * names, int lineno, int col_offset, PyArena *arena)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1498 {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1499 stmt_ty p;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1500 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1501 if (!p)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1502 return NULL;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1503 p->kind = Nonlocal_kind;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1504 p->v.Nonlocal.names = names;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1505 p->lineno = lineno;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1506 p->col_offset = col_offset;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1507 return p;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1508 }
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1509
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1510 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	1511 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	1512 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1513 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1514 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1515 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1516 "field value is required for Expr");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1517 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1518 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1519 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1520 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1521 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1522 p->kind = Expr_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1523 p->v.Expr.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1524 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	1525 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1526 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1527 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1528
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1529 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	1530 Pass(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1531 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1532 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	1533 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1534 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1535 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1536 p->kind = Pass_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1537 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	1538 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1539 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1540 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1541
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1542 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	1543 Break(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1544 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1545 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	1546 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1547 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1548 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1549 p->kind = Break_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1550 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	1551 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1552 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1553 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1554
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1555 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	1556 Continue(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1557 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1558 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	1559 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1560 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1561 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1562 p->kind = Continue_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1563 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	1564 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1565 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1566 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1567
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1568 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	1569 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	1570 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1571 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1572 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1573 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1574 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1575 "field op is required for BoolOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1576 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1577 }
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	1578 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1579 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1580 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1581 p->kind = BoolOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1582 p->v.BoolOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1583 p->v.BoolOp.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1584 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	1585 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1586 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1587 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1588
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1589 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	1590 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	1591 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1592 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1593 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1594 if (!left) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1595 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1596 "field left is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1597 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1598 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1599 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1600 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1601 "field op is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1602 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1603 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1604 if (!right) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1605 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1606 "field right is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1607 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1608 }
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	1609 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1610 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1611 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1612 p->kind = BinOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1613 p->v.BinOp.left = left;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1614 p->v.BinOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1615 p->v.BinOp.right = right;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1616 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	1617 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1618 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1619 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1620
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1621 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	1622 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	1623 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1624 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1625 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1626 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1627 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1628 "field op is required for UnaryOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1629 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1630 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1631 if (!operand) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1632 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1633 "field operand is required for UnaryOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1634 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1635 }
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	1636 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1637 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1638 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1639 p->kind = UnaryOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1640 p->v.UnaryOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1641 p->v.UnaryOp.operand = operand;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1642 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	1643 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1644 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1645 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1646
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1647 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	1648 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	1649 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1650 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1651 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1652 if (!args) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1653 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1654 "field args is required for Lambda");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1655 return NULL;
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 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1658 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1659 "field body is required for Lambda");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1660 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1661 }
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	1662 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1663 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1664 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1665 p->kind = Lambda_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1666 p->v.Lambda.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1667 p->v.Lambda.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1668 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	1669 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1670 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1671 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1672
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1673 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	1674 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	1675 PyArena *arena)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1676 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1677 expr_ty p;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1678 if (!test) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1679 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1680 "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	1681 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1682 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1683 if (!body) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1684 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1685 "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	1686 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1687 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1688 if (!orelse) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1689 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1690 "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	1691 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1692 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1693 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1694 if (!p)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1695 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1696 p->kind = IfExp_kind;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1697 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	1698 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	1699 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	1700 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	1701 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	1702 return p;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1703 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1704
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1705 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	1706 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	1707 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1708 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1709 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	1710 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1711 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1712 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1713 p->kind = Dict_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1714 p->v.Dict.keys = keys;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1715 p->v.Dict.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1716 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	1717 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1718 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1719 }
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
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1722 Set(asdl_seq * elts, int lineno, int col_offset, PyArena *arena)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1723 {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1724 expr_ty p;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1725 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1726 if (!p)
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1727 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1728 p->kind = Set_kind;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1729 p->v.Set.elts = elts;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1730 p->lineno = lineno;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1731 p->col_offset = col_offset;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1732 return p;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1733 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1734
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1735 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1736 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	1737 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1738 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1739 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1740 if (!elt) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1741 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1742 "field elt is required for ListComp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1743 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1744 }
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	1745 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1746 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1747 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1748 p->kind = ListComp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1749 p->v.ListComp.elt = elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1750 p->v.ListComp.generators = generators;
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
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1757 SetComp(expr_ty elt, asdl_seq * generators, int lineno, int col_offset, PyArena
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1758 *arena)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1759 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1760 expr_ty p;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1761 if (!elt) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1762 PyErr_SetString(PyExc_ValueError,
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1763 "field elt is required for SetComp");
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1764 return NULL;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1765 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1766 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1767 if (!p)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1768 return NULL;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1769 p->kind = SetComp_kind;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1770 p->v.SetComp.elt = elt;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1771 p->v.SetComp.generators = generators;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1772 p->lineno = lineno;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1773 p->col_offset = col_offset;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1774 return p;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1775 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1776
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1777 expr_ty
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1778 DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int lineno, int
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1779 col_offset, PyArena *arena)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1780 {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1781 expr_ty p;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1782 if (!key) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1783 PyErr_SetString(PyExc_ValueError,
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1784 "field key is required for DictComp");
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1785 return NULL;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1786 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1787 if (!value) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1788 PyErr_SetString(PyExc_ValueError,
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1789 "field value is required for DictComp");
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1790 return NULL;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1791 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1792 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1793 if (!p)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1794 return NULL;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1795 p->kind = DictComp_kind;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1796 p->v.DictComp.key = key;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1797 p->v.DictComp.value = value;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1798 p->v.DictComp.generators = generators;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1799 p->lineno = lineno;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1800 p->col_offset = col_offset;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1801 return p;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1802 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1803
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1804 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	1805 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	1806 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1807 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1808 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1809 if (!elt) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1810 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1811 "field elt is required for GeneratorExp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1812 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1813 }
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	1814 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1815 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1816 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1817 p->kind = GeneratorExp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1818 p->v.GeneratorExp.elt = elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1819 p->v.GeneratorExp.generators = generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1820 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	1821 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1822 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1825 expr_ty
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1826 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	1827 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1828 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	1829 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1830 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1831 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1832 p->kind = Yield_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1833 p->v.Yield.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1834 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	1835 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1836 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1837 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1838
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1839 expr_ty
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1840 YieldFrom(expr_ty value, int lineno, int col_offset, PyArena *arena)
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1841 {
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1842 expr_ty p;
80589 ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1843 if (!value) {
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1844 PyErr_SetString(PyExc_ValueError,
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1845 "field value is required for YieldFrom");
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1846 return NULL;
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1847 }
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1848 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1849 if (!p)
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1850 return NULL;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1851 p->kind = YieldFrom_kind;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1852 p->v.YieldFrom.value = value;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1853 p->lineno = lineno;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1854 p->col_offset = col_offset;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1855 return p;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1856 }
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1857
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1858 expr_ty
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	1859 Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators, int lineno,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	1860 int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1861 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1862 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1863 if (!left) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1864 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1865 "field left is required for Compare");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1866 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1867 }
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	1868 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1869 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1870 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1871 p->kind = Compare_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1872 p->v.Compare.left = left;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1873 p->v.Compare.ops = ops;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1874 p->v.Compare.comparators = comparators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1875 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	1876 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1877 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1878 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1879
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1880 expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1881 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	1882 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	1883 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1884 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1885 if (!func) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1886 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1887 "field func is required for Call");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1888 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1889 }
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	1890 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1891 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1892 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1893 p->kind = Call_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1894 p->v.Call.func = func;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1895 p->v.Call.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1896 p->v.Call.keywords = keywords;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1897 p->v.Call.starargs = starargs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1898 p->v.Call.kwargs = kwargs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1899 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	1900 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1901 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1902 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1903
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1904 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	1905 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	1906 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1907 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1908 if (!n) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1909 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1910 "field n is required for Num");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1911 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1912 }
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	1913 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1914 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1915 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1916 p->kind = Num_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1917 p->v.Num.n = n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1918 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	1919 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1920 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1921 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1922
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1923 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	1924 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	1925 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1926 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1927 if (!s) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1928 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1929 "field s is required for Str");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1930 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1931 }
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	1932 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1933 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1934 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1935 p->kind = Str_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1936 p->v.Str.s = s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1937 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1938 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1939 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1940 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1941
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1942 expr_ty
71792 f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	1943 Bytes(bytes s, int lineno, int col_offset, PyArena *arena)
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1944 {
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1945 expr_ty p;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1946 if (!s) {
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1947 PyErr_SetString(PyExc_ValueError,
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1948 "field s is required for Bytes");
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1949 return NULL;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1950 }
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1951 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1952 if (!p)
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1953 return NULL;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1954 p->kind = Bytes_kind;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1955 p->v.Bytes.s = s;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1956 p->lineno = lineno;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1957 p->col_offset = col_offset;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1958 return p;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1959 }
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1960
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1961 expr_ty
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1962 NameConstant(singleton value, int lineno, int col_offset, PyArena *arena)
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1963 {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1964 expr_ty p;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1965 if (!value) {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1966 PyErr_SetString(PyExc_ValueError,
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1967 "field value is required for NameConstant");
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1968 return NULL;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1969 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1970 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1971 if (!p)
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1972 return NULL;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1973 p->kind = NameConstant_kind;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1974 p->v.NameConstant.value = value;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1975 p->lineno = lineno;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1976 p->col_offset = col_offset;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1977 return p;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1978 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1979
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1980 expr_ty
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1981 Ellipsis(int lineno, int col_offset, PyArena *arena)
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1982 {
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1983 expr_ty p;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1984 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1985 if (!p)
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1986 return NULL;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1987 p->kind = Ellipsis_kind;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1988 p->lineno = lineno;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1989 p->col_offset = col_offset;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1990 return p;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1991 }
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1992
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1993 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	1994 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	1995 col_offset, PyArena *arena)
35742 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 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1998 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1999 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2000 "field value is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2001 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2002 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2003 if (!attr) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2004 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2005 "field attr is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2006 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2007 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2008 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2009 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2010 "field ctx is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2011 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2012 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2013 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2014 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2015 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2016 p->kind = Attribute_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2017 p->v.Attribute.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2018 p->v.Attribute.attr = attr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2019 p->v.Attribute.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2020 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	2021 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2022 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2023 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2024
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2025 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	2026 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	2027 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2028 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2029 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2030 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2031 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2032 "field value is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2033 return NULL;
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 if (!slice) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2036 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2037 "field slice is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2038 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2039 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2040 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2041 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2042 "field ctx is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2043 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2044 }
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	2045 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2046 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2047 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2048 p->kind = Subscript_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2049 p->v.Subscript.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2050 p->v.Subscript.slice = slice;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2051 p->v.Subscript.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2052 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	2053 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2054 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2055 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2056
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2057 expr_ty
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2058 Starred(expr_ty value, expr_context_ty ctx, int lineno, int col_offset, PyArena
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2059 *arena)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2060 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2061 expr_ty p;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2062 if (!value) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2063 PyErr_SetString(PyExc_ValueError,
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2064 "field value is required for Starred");
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2065 return NULL;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2066 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2067 if (!ctx) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2068 PyErr_SetString(PyExc_ValueError,
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2069 "field ctx is required for Starred");
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2070 return NULL;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2071 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2072 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2073 if (!p)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2074 return NULL;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2075 p->kind = Starred_kind;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2076 p->v.Starred.value = value;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2077 p->v.Starred.ctx = ctx;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2078 p->lineno = lineno;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2079 p->col_offset = col_offset;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2080 return p;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2081 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2082
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2083 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	2084 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	2085 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2086 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2087 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2088 if (!id) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2089 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2090 "field id is required for Name");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2091 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2092 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2093 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2094 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2095 "field ctx is required for Name");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2096 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2097 }
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	2098 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2099 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2100 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2101 p->kind = Name_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2102 p->v.Name.id = id;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2103 p->v.Name.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2104 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	2105 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2106 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2107 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2108
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2109 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	2110 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	2111 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2112 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2113 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2114 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2115 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2116 "field ctx is required for List");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2117 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2118 }
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	2119 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2120 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2121 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2122 p->kind = List_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2123 p->v.List.elts = elts;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2124 p->v.List.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2125 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	2126 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2127 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2128 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2129
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2130 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	2131 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	2132 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2133 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2134 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2135 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2136 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2137 "field ctx is required for Tuple");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2138 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2139 }
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	2140 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2141 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2142 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2143 p->kind = Tuple_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2144 p->v.Tuple.elts = elts;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2145 p->v.Tuple.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2146 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	2147 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2148 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2149 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2150
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2151 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	2152 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	2153 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2154 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	2155 p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2156 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2157 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2158 p->kind = Slice_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2159 p->v.Slice.lower = lower;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2160 p->v.Slice.upper = upper;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2161 p->v.Slice.step = step;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2162 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2163 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2164
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2165 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	2166 ExtSlice(asdl_seq * dims, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2167 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2168 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	2169 p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2170 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2171 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2172 p->kind = ExtSlice_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2173 p->v.ExtSlice.dims = dims;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2174 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2175 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2176
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2177 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	2178 Index(expr_ty value, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2179 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2180 slice_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2181 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2182 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2183 "field value is required for Index");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2184 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2185 }
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	2186 p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2187 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2188 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2189 p->kind = Index_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2190 p->v.Index.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2191 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2192 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2193
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2194 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	2195 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	2196 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2197 comprehension_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2198 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2199 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2200 "field target is required for comprehension");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2201 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2202 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2203 if (!iter) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2204 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2205 "field iter is required for comprehension");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2206 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2207 }
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	2208 p = (comprehension_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2209 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2210 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2211 p->target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2212 p->iter = iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2213 p->ifs = ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2214 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2215 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2216
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2217 excepthandler_ty
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2218 ExceptHandler(expr_ty type, identifier name, asdl_seq * body, int lineno, int
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	2219 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2220 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2221 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	2222 p = (excepthandler_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2223 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2224 return NULL;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2225 p->kind = ExceptHandler_kind;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2226 p->v.ExceptHandler.type = type;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2227 p->v.ExceptHandler.name = name;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2228 p->v.ExceptHandler.body = body;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	2229 p->lineno = lineno;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	2230 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2231 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2232 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2233
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2234 arguments_ty
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	2235 arguments(asdl_seq * args, arg_ty vararg, asdl_seq * kwonlyargs, asdl_seq *
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	2236 kw_defaults, arg_ty kwarg, asdl_seq * defaults, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2237 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2238 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	2239 p = (arguments_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2240 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2241 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2242 p->args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2243 p->vararg = vararg;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	2244 p->kwonlyargs = kwonlyargs;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	2245 p->kw_defaults = kw_defaults;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2246 p->kwarg = kwarg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2247 p->defaults = defaults;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2248 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2249 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2250
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2251 arg_ty
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	2252 arg(identifier arg, expr_ty annotation, PyArena *arena)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2253 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2254 arg_ty p;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2255 if (!arg) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2256 PyErr_SetString(PyExc_ValueError,
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	2257 "field arg is required for arg");
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2258 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2259 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2260 p = (arg_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2261 if (!p)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2262 return NULL;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	2263 p->arg = arg;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	2264 p->annotation = annotation;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2265 return p;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2266 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2267
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2268 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	2269 keyword(identifier arg, expr_ty value, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2270 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2271 keyword_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2272 if (!arg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2273 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2274 "field arg is required for keyword");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2275 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2276 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2277 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2278 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2279 "field value is required for keyword");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2280 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2281 }
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	2282 p = (keyword_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2283 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2284 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2285 p->arg = arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2286 p->value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2287 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2288 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2289
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2290 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	2291 alias(identifier name, identifier asname, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2292 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2293 alias_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2294 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2295 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2296 "field name is required for alias");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2297 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2298 }
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	2299 p = (alias_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	2300 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2301 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2302 p->name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2303 p->asname = asname;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2304 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2305 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2306
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2307 withitem_ty
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2308 withitem(expr_ty context_expr, expr_ty optional_vars, PyArena *arena)
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2309 {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2310 withitem_ty p;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2311 if (!context_expr) {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2312 PyErr_SetString(PyExc_ValueError,
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2313 "field context_expr is required for withitem");
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2314 return NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2315 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2316 p = (withitem_ty)PyArena_Malloc(arena, sizeof(*p));
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2317 if (!p)
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2318 return NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2319 p->context_expr = context_expr;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2320 p->optional_vars = optional_vars;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2321 return p;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2322 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2323
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2324
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2325 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2326 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	2327 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2328 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	2329 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	2330 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2331 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	2332 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2333 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2334
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2335 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2336 case Module_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2337 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	2338 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	2339 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	2340 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2341 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2342 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2343 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2344 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2345 case Interactive_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2346 result = PyType_GenericNew(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	2347 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2348 value = ast2obj_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	2349 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2350 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2351 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2352 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2353 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2354 case Expression_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2355 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	2356 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	2357 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	2358 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2359 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2360 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2361 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2362 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2363 case Suite_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2364 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	2365 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	2366 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	2367 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2368 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2369 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2370 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2371 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2372 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2373 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2374 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2375 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2376 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2377 return NULL;
36174 85b2d804ac0a Regenerate. Martin v. Löwis <martin@v.loewis.de> parents: 36065 diff changeset	2378 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2379
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2380 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2381 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	2382 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2383 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	2384 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	2385 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2386 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	2387 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2388 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2389
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2390 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2391 case FunctionDef_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2392 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	2393 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	2394 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	2395 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2396 if (_PyObject_SetAttrId(result, &PyId_name, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2397 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2398 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2399 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	2400 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2401 if (_PyObject_SetAttrId(result, &PyId_args, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2402 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2403 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2404 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	2405 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2406 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2407 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2408 Py_DECREF(value);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2409 value = ast2obj_list(o->v.FunctionDef.decorator_list,
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2410 ast2obj_expr);
36660 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;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2412 if (_PyObject_SetAttrId(result, &PyId_decorator_list, value) ==
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2413 -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2414 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2415 Py_DECREF(value);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2416 value = ast2obj_expr(o->v.FunctionDef.returns);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2417 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2418 if (_PyObject_SetAttrId(result, &PyId_returns, value) == -1)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2419 goto failed;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2420 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	2421 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2422 case ClassDef_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2423 result = PyType_GenericNew(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	2424 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2425 value = ast2obj_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	2426 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2427 if (_PyObject_SetAttrId(result, &PyId_name, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2428 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2429 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2430 value = ast2obj_list(o->v.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	2431 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2432 if (_PyObject_SetAttrId(result, &PyId_bases, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2433 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2434 Py_DECREF(value);
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2435 value = ast2obj_list(o->v.ClassDef.keywords, ast2obj_keyword);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2436 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2437 if (_PyObject_SetAttrId(result, &PyId_keywords, value) == -1)
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2438 goto failed;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2439 Py_DECREF(value);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2440 value = ast2obj_expr(o->v.ClassDef.starargs);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2441 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2442 if (_PyObject_SetAttrId(result, &PyId_starargs, value) == -1)
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2443 goto failed;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2444 Py_DECREF(value);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2445 value = ast2obj_expr(o->v.ClassDef.kwargs);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2446 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2447 if (_PyObject_SetAttrId(result, &PyId_kwargs, value) == -1)
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2448 goto failed;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2449 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	2450 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	2451 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2452 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2453 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2454 Py_DECREF(value);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2455 value = ast2obj_list(o->v.ClassDef.decorator_list,
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2456 ast2obj_expr);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2457 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2458 if (_PyObject_SetAttrId(result, &PyId_decorator_list, value) ==
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2459 -1)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2460 goto failed;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 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 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2463 case Return_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2464 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	2465 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	2466 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	2467 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2468 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2469 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2470 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2471 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2472 case Delete_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2473 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	2474 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	2475 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	2476 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2477 if (_PyObject_SetAttrId(result, &PyId_targets, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2478 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2479 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2480 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2481 case Assign_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2482 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	2483 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	2484 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	2485 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2486 if (_PyObject_SetAttrId(result, &PyId_targets, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2487 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2488 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2489 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	2490 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2491 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2492 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2493 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2494 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2495 case AugAssign_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2496 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	2497 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	2498 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	2499 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2500 if (_PyObject_SetAttrId(result, &PyId_target, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2501 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2502 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2503 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	2504 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2505 if (_PyObject_SetAttrId(result, &PyId_op, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2506 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2507 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2508 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	2509 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2510 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2511 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2512 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2513 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2514 case For_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2515 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	2516 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	2517 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	2518 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2519 if (_PyObject_SetAttrId(result, &PyId_target, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2520 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2521 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2522 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	2523 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2524 if (_PyObject_SetAttrId(result, &PyId_iter, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2525 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2526 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2527 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	2528 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2529 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2530 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2531 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2532 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	2533 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2534 if (_PyObject_SetAttrId(result, &PyId_orelse, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2535 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2536 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2537 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2538 case While_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2539 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	2540 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	2541 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	2542 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2543 if (_PyObject_SetAttrId(result, &PyId_test, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2544 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2545 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2546 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	2547 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2548 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2549 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2550 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2551 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	2552 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2553 if (_PyObject_SetAttrId(result, &PyId_orelse, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2554 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2555 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2556 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2557 case If_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2558 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	2559 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	2560 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	2561 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2562 if (_PyObject_SetAttrId(result, &PyId_test, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2563 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2564 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2565 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	2566 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2567 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2568 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2569 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2570 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	2571 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2572 if (_PyObject_SetAttrId(result, &PyId_orelse, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2573 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2574 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2575 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2576 case With_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2577 result = PyType_GenericNew(With_type, NULL, NULL);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2578 if (!result) goto failed;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2579 value = ast2obj_list(o->v.With.items, ast2obj_withitem);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2580 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2581 if (_PyObject_SetAttrId(result, &PyId_items, value) == -1)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2582 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2583 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2584 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	2585 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2586 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2587 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2588 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2589 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2590 case Raise_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2591 result = PyType_GenericNew(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	2592 if (!result) goto failed;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	2593 value = ast2obj_expr(o->v.Raise.exc);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2594 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2595 if (_PyObject_SetAttrId(result, &PyId_exc, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2596 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2597 Py_DECREF(value);
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	2598 value = ast2obj_expr(o->v.Raise.cause);
36660 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;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2600 if (_PyObject_SetAttrId(result, &PyId_cause, value) == -1)
36660 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;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2604 case Try_kind:
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2605 result = PyType_GenericNew(Try_type, NULL, NULL);
36660 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;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2607 value = ast2obj_list(o->v.Try.body, ast2obj_stmt);
36660 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;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2609 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 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);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2612 value = ast2obj_list(o->v.Try.handlers, ast2obj_excepthandler);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2613 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2614 if (_PyObject_SetAttrId(result, &PyId_handlers, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2615 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2616 Py_DECREF(value);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2617 value = ast2obj_list(o->v.Try.orelse, ast2obj_stmt);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2618 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2619 if (_PyObject_SetAttrId(result, &PyId_orelse, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2620 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2621 Py_DECREF(value);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2622 value = ast2obj_list(o->v.Try.finalbody, ast2obj_stmt);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2623 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2624 if (_PyObject_SetAttrId(result, &PyId_finalbody, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2625 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2626 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2627 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2628 case Assert_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2629 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	2630 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	2631 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	2632 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2633 if (_PyObject_SetAttrId(result, &PyId_test, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2634 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2635 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2636 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	2637 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2638 if (_PyObject_SetAttrId(result, &PyId_msg, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2639 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2640 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2641 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2642 case Import_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2643 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	2644 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	2645 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	2646 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2647 if (_PyObject_SetAttrId(result, &PyId_names, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2648 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2649 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2650 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2651 case ImportFrom_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2652 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	2653 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	2654 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	2655 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2656 if (_PyObject_SetAttrId(result, &PyId_module, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2657 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2658 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2659 value = ast2obj_list(o->v.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	2660 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2661 if (_PyObject_SetAttrId(result, &PyId_names, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2662 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2663 Py_DECREF(value);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2664 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	2665 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2666 if (_PyObject_SetAttrId(result, &PyId_level, value) == -1)
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2667 goto failed;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2668 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	2669 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2670 case Global_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2671 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	2672 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	2673 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	2674 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2675 if (_PyObject_SetAttrId(result, &PyId_names, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2676 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2677 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2678 break;
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2679 case Nonlocal_kind:
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2680 result = PyType_GenericNew(Nonlocal_type, NULL, NULL);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2681 if (!result) goto failed;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2682 value = ast2obj_list(o->v.Nonlocal.names, ast2obj_identifier);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2683 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2684 if (_PyObject_SetAttrId(result, &PyId_names, value) == -1)
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2685 goto failed;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2686 Py_DECREF(value);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2687 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2688 case Expr_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2689 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	2690 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	2691 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	2692 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2693 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2694 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2695 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2696 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2697 case Pass_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2698 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	2699 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	2700 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2701 case Break_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2702 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	2703 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	2704 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2705 case Continue_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2706 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	2707 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	2708 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2709 }
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2710 value = ast2obj_int(o->lineno);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2711 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2712 if (_PyObject_SetAttrId(result, &PyId_lineno, value) < 0)
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2713 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2714 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	2715 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	2716 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2717 if (_PyObject_SetAttrId(result, &PyId_col_offset, value) < 0)
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2718 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2719 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	2720 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2721 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2722 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2723 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2724 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2725 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2726
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2727 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2728 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	2729 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2730 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	2731 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	2732 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2733 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	2734 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2735 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2736
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2737 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2738 case BoolOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2739 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	2740 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	2741 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	2742 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2743 if (_PyObject_SetAttrId(result, &PyId_op, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2744 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2745 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2746 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	2747 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2748 if (_PyObject_SetAttrId(result, &PyId_values, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2749 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2750 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2751 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2752 case BinOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2753 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	2754 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	2755 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	2756 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2757 if (_PyObject_SetAttrId(result, &PyId_left, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2758 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2759 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2760 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	2761 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2762 if (_PyObject_SetAttrId(result, &PyId_op, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2763 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2764 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2765 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	2766 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2767 if (_PyObject_SetAttrId(result, &PyId_right, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2768 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2769 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2770 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2771 case UnaryOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2772 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	2773 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	2774 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	2775 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2776 if (_PyObject_SetAttrId(result, &PyId_op, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2777 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2778 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2779 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	2780 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2781 if (_PyObject_SetAttrId(result, &PyId_operand, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2782 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2783 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2784 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2785 case Lambda_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2786 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	2787 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	2788 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	2789 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2790 if (_PyObject_SetAttrId(result, &PyId_args, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2791 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2792 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2793 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	2794 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2795 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2796 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2797 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2798 break;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2799 case IfExp_kind:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2800 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	2801 if (!result) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2802 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	2803 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2804 if (_PyObject_SetAttrId(result, &PyId_test, value) == -1)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2805 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2806 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2807 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	2808 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2809 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2810 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2811 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2812 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	2813 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2814 if (_PyObject_SetAttrId(result, &PyId_orelse, value) == -1)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2815 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2816 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2817 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2818 case Dict_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2819 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	2820 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	2821 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	2822 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2823 if (_PyObject_SetAttrId(result, &PyId_keys, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2824 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2825 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2826 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	2827 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2828 if (_PyObject_SetAttrId(result, &PyId_values, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2829 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2830 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2831 break;
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2832 case Set_kind:
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2833 result = PyType_GenericNew(Set_type, NULL, NULL);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2834 if (!result) goto failed;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2835 value = ast2obj_list(o->v.Set.elts, ast2obj_expr);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2836 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2837 if (_PyObject_SetAttrId(result, &PyId_elts, value) == -1)
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2838 goto failed;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2839 Py_DECREF(value);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2840 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2841 case ListComp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2842 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	2843 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	2844 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	2845 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2846 if (_PyObject_SetAttrId(result, &PyId_elt, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2847 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2848 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2849 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	2850 ast2obj_comprehension);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2851 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2852 if (_PyObject_SetAttrId(result, &PyId_generators, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2853 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2854 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2855 break;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2856 case SetComp_kind:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2857 result = PyType_GenericNew(SetComp_type, NULL, NULL);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2858 if (!result) goto failed;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2859 value = ast2obj_expr(o->v.SetComp.elt);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2860 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2861 if (_PyObject_SetAttrId(result, &PyId_elt, value) == -1)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2862 goto failed;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2863 Py_DECREF(value);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2864 value = ast2obj_list(o->v.SetComp.generators,
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2865 ast2obj_comprehension);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2866 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2867 if (_PyObject_SetAttrId(result, &PyId_generators, value) == -1)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2868 goto failed;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2869 Py_DECREF(value);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2870 break;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2871 case DictComp_kind:
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2872 result = PyType_GenericNew(DictComp_type, NULL, NULL);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2873 if (!result) goto failed;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2874 value = ast2obj_expr(o->v.DictComp.key);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2875 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2876 if (_PyObject_SetAttrId(result, &PyId_key, value) == -1)
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2877 goto failed;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2878 Py_DECREF(value);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2879 value = ast2obj_expr(o->v.DictComp.value);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2880 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2881 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2882 goto failed;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2883 Py_DECREF(value);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2884 value = ast2obj_list(o->v.DictComp.generators,
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2885 ast2obj_comprehension);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2886 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2887 if (_PyObject_SetAttrId(result, &PyId_generators, value) == -1)
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2888 goto failed;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2889 Py_DECREF(value);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2890 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2891 case GeneratorExp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2892 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	2893 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	2894 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	2895 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2896 if (_PyObject_SetAttrId(result, &PyId_elt, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2897 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2898 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2899 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	2900 ast2obj_comprehension);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2901 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2902 if (_PyObject_SetAttrId(result, &PyId_generators, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2903 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2904 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2905 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2906 case Yield_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2907 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	2908 if (!result) goto failed;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2909 value = ast2obj_expr(o->v.Yield.value);
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73701 diff changeset	2910 if (!value) goto failed;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2911 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73701 diff changeset	2912 goto failed;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73701 diff changeset	2913 Py_DECREF(value);
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2914 break;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2915 case YieldFrom_kind:
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2916 result = PyType_GenericNew(YieldFrom_type, NULL, NULL);
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2917 if (!result) goto failed;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2918 value = ast2obj_expr(o->v.YieldFrom.value);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2919 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2920 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2921 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2922 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2923 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2924 case Compare_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2925 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	2926 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	2927 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	2928 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2929 if (_PyObject_SetAttrId(result, &PyId_left, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2930 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2931 Py_DECREF(value);
36661 710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2932 {
76964 c18a1a82bb07 use Py_ssize_t for ast sequence lengths Benjamin Peterson <benjamin@python.org> parents: 76948 diff changeset	2933 Py_ssize_t i, n = asdl_seq_LEN(o->v.Compare.ops);
36661 710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2934 value = PyList_New(n);
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2935 if (!value) goto failed;
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2936 for(i = 0; i < n; i++)
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2937 PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)asdl_seq_GET(o->v.Compare.ops, i)));
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2938 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2939 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2940 if (_PyObject_SetAttrId(result, &PyId_ops, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2941 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2942 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2943 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	2944 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2945 if (_PyObject_SetAttrId(result, &PyId_comparators, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2946 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2947 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2948 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2949 case Call_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2950 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	2951 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	2952 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	2953 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2954 if (_PyObject_SetAttrId(result, &PyId_func, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2955 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2956 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2957 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	2958 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2959 if (_PyObject_SetAttrId(result, &PyId_args, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2960 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2961 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2962 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	2963 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2964 if (_PyObject_SetAttrId(result, &PyId_keywords, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2965 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2966 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2967 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	2968 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2969 if (_PyObject_SetAttrId(result, &PyId_starargs, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2970 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2971 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2972 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	2973 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2974 if (_PyObject_SetAttrId(result, &PyId_kwargs, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2975 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2976 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2977 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2978 case Num_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2979 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	2980 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	2981 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	2982 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2983 if (_PyObject_SetAttrId(result, &PyId_n, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2984 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2985 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2986 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2987 case Str_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2988 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	2989 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	2990 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	2991 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2992 if (_PyObject_SetAttrId(result, &PyId_s, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2993 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2994 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2995 break;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2996 case Bytes_kind:
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2997 result = PyType_GenericNew(Bytes_type, NULL, NULL);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2998 if (!result) goto failed;
71792 f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	2999 value = ast2obj_bytes(o->v.Bytes.s);
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	3000 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3001 if (_PyObject_SetAttrId(result, &PyId_s, value) == -1)
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	3002 goto failed;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	3003 Py_DECREF(value);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	3004 break;
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3005 case NameConstant_kind:
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3006 result = PyType_GenericNew(NameConstant_type, NULL, NULL);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3007 if (!result) goto failed;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3008 value = ast2obj_singleton(o->v.NameConstant.value);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3009 if (!value) goto failed;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3010 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3011 goto failed;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3012 Py_DECREF(value);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	3013 break;
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3014 case Ellipsis_kind:
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3015 result = PyType_GenericNew(Ellipsis_type, NULL, NULL);
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3016 if (!result) goto failed;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3017 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3018 case Attribute_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3019 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	3020 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	3021 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	3022 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3023 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 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 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	3027 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3028 if (_PyObject_SetAttrId(result, &PyId_attr, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3029 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3030 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3031 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	3032 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3033 if (_PyObject_SetAttrId(result, &PyId_ctx, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3034 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3035 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3036 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3037 case Subscript_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3038 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	3039 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	3040 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	3041 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3042 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3043 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3044 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3045 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	3046 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3047 if (_PyObject_SetAttrId(result, &PyId_slice, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3048 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3049 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3050 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	3051 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3052 if (_PyObject_SetAttrId(result, &PyId_ctx, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3053 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3054 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3055 break;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3056 case Starred_kind:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3057 result = PyType_GenericNew(Starred_type, NULL, NULL);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3058 if (!result) goto failed;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3059 value = ast2obj_expr(o->v.Starred.value);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3060 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3061 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3062 goto failed;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3063 Py_DECREF(value);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3064 value = ast2obj_expr_context(o->v.Starred.ctx);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3065 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3066 if (_PyObject_SetAttrId(result, &PyId_ctx, value) == -1)
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3067 goto failed;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3068 Py_DECREF(value);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3069 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3070 case Name_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3071 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	3072 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	3073 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	3074 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3075 if (_PyObject_SetAttrId(result, &PyId_id, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3076 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3077 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3078 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	3079 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3080 if (_PyObject_SetAttrId(result, &PyId_ctx, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3081 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3082 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3083 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3084 case List_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3085 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	3086 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	3087 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	3088 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3089 if (_PyObject_SetAttrId(result, &PyId_elts, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3090 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3091 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3092 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	3093 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3094 if (_PyObject_SetAttrId(result, &PyId_ctx, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3095 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3096 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3097 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3098 case Tuple_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3099 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	3100 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	3101 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	3102 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3103 if (_PyObject_SetAttrId(result, &PyId_elts, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3104 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3105 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3106 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	3107 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3108 if (_PyObject_SetAttrId(result, &PyId_ctx, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3109 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3110 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3111 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3112 }
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	3113 value = ast2obj_int(o->lineno);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	3114 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3115 if (_PyObject_SetAttrId(result, &PyId_lineno, value) < 0)
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	3116 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	3117 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	3118 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	3119 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3120 if (_PyObject_SetAttrId(result, &PyId_col_offset, value) < 0)
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	3121 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	3122 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	3123 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3124 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3125 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3126 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3127 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3128 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3129
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3130 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	3131 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3132 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3133 case Load:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3134 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	3135 return Load_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3136 case Store:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3137 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	3138 return Store_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3139 case Del:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3140 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	3141 return Del_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3142 case AugLoad:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3143 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	3144 return AugLoad_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3145 case AugStore:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3146 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	3147 return AugStore_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3148 case Param:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3149 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	3150 return Param_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3151 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3152 /* should never happen, but just in case ... */
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3153 PyErr_Format(PyExc_SystemError, "unknown expr_context found");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3154 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3155 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3156 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3157 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3158 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	3159 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3160 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	3161 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	3162 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3163 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	3164 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3165 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3166
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3167 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3168 case Slice_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3169 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	3170 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	3171 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	3172 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3173 if (_PyObject_SetAttrId(result, &PyId_lower, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3174 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3175 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3176 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	3177 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3178 if (_PyObject_SetAttrId(result, &PyId_upper, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3179 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3180 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3181 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	3182 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3183 if (_PyObject_SetAttrId(result, &PyId_step, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3184 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3185 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3186 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3187 case ExtSlice_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3188 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	3189 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	3190 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	3191 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3192 if (_PyObject_SetAttrId(result, &PyId_dims, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3193 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3194 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3195 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3196 case Index_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3197 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	3198 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	3199 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	3200 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3201 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3202 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3203 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3204 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3205 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3206 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3207 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3208 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3209 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3210 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3211 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3212
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3213 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	3214 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3215 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3216 case And:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3217 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	3218 return And_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3219 case Or:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3220 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	3221 return Or_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3222 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3223 /* should never happen, but just in case ... */
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3224 PyErr_Format(PyExc_SystemError, "unknown boolop found");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3225 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3226 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3227 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3228 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	3229 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3230 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3231 case Add:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3232 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	3233 return Add_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3234 case Sub:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3235 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	3236 return Sub_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3237 case Mult:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3238 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	3239 return Mult_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3240 case Div:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3241 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	3242 return Div_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3243 case Mod:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3244 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	3245 return Mod_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3246 case Pow:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3247 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	3248 return Pow_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3249 case LShift:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3250 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	3251 return LShift_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3252 case RShift:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3253 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	3254 return RShift_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3255 case BitOr:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3256 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	3257 return BitOr_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3258 case BitXor:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3259 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	3260 return BitXor_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3261 case BitAnd:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3262 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	3263 return BitAnd_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3264 case FloorDiv:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3265 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	3266 return FloorDiv_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3267 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3268 /* should never happen, but just in case ... */
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3269 PyErr_Format(PyExc_SystemError, "unknown operator found");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3270 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3271 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3272 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3273 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	3274 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3275 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3276 case Invert:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3277 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	3278 return Invert_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3279 case Not:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3280 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	3281 return Not_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3282 case UAdd:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3283 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	3284 return UAdd_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3285 case USub:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3286 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	3287 return USub_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3288 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3289 /* should never happen, but just in case ... */
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3290 PyErr_Format(PyExc_SystemError, "unknown unaryop found");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3291 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3292 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3293 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3294 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	3295 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3296 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3297 case Eq:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3298 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	3299 return Eq_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3300 case NotEq:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3301 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	3302 return NotEq_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3303 case Lt:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3304 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	3305 return Lt_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3306 case LtE:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3307 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	3308 return LtE_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3309 case Gt:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3310 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	3311 return Gt_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3312 case GtE:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3313 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	3314 return GtE_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3315 case Is:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3316 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	3317 return Is_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3318 case IsNot:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3319 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	3320 return IsNot_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3321 case In:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3322 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	3323 return In_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3324 case NotIn:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3325 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	3326 return NotIn_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3327 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3328 /* should never happen, but just in case ... */
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3329 PyErr_Format(PyExc_SystemError, "unknown cmpop found");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3330 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3331 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3332 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3333 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3334 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	3335 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3336 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	3337 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	3338 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3339 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	3340 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3341 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3342
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3343 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	3344 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	3345 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	3346 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3347 if (_PyObject_SetAttrId(result, &PyId_target, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3348 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3349 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3350 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	3351 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3352 if (_PyObject_SetAttrId(result, &PyId_iter, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3353 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3354 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3355 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	3356 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3357 if (_PyObject_SetAttrId(result, &PyId_ifs, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3358 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3359 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3360 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3361 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3362 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3363 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3364 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3365 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3366
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3367 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3368 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	3369 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3370 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	3371 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	3372 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3373 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	3374 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3375 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3376
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3377 switch (o->kind) {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3378 case ExceptHandler_kind:
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3379 result = PyType_GenericNew(ExceptHandler_type, NULL, NULL);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3380 if (!result) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3381 value = ast2obj_expr(o->v.ExceptHandler.type);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3382 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3383 if (_PyObject_SetAttrId(result, &PyId_type, value) == -1)
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3384 goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3385 Py_DECREF(value);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3386 value = ast2obj_identifier(o->v.ExceptHandler.name);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3387 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3388 if (_PyObject_SetAttrId(result, &PyId_name, value) == -1)
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3389 goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3390 Py_DECREF(value);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3391 value = ast2obj_list(o->v.ExceptHandler.body, ast2obj_stmt);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3392 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3393 if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3394 goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3395 Py_DECREF(value);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3396 break;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3397 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	3398 value = ast2obj_int(o->lineno);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	3399 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3400 if (_PyObject_SetAttrId(result, &PyId_lineno, value) < 0)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	3401 goto failed;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	3402 Py_DECREF(value);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	3403 value = ast2obj_int(o->col_offset);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	3404 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3405 if (_PyObject_SetAttrId(result, &PyId_col_offset, value) < 0)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	3406 goto failed;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	3407 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	3408 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3409 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3410 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3411 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3412 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3413 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3414
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3415 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3416 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	3417 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3418 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	3419 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	3420 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3421 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	3422 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3423 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3424
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3425 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	3426 if (!result) return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3427 value = ast2obj_list(o->args, ast2obj_arg);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3428 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3429 if (_PyObject_SetAttrId(result, &PyId_args, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3430 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3431 Py_DECREF(value);
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3432 value = ast2obj_arg(o->vararg);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3433 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3434 if (_PyObject_SetAttrId(result, &PyId_vararg, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3435 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3436 Py_DECREF(value);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3437 value = ast2obj_list(o->kwonlyargs, ast2obj_arg);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	3438 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3439 if (_PyObject_SetAttrId(result, &PyId_kwonlyargs, value) == -1)
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	3440 goto failed;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	3441 Py_DECREF(value);
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3442 value = ast2obj_list(o->kw_defaults, ast2obj_expr);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3443 if (!value) goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3444 if (_PyObject_SetAttrId(result, &PyId_kw_defaults, value) == -1)
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3445 goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3446 Py_DECREF(value);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3447 value = ast2obj_arg(o->kwarg);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3448 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3449 if (_PyObject_SetAttrId(result, &PyId_kwarg, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3450 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3451 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3452 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	3453 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3454 if (_PyObject_SetAttrId(result, &PyId_defaults, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3455 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3456 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3457 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3458 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3459 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3460 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3461 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3462 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3463
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3464 PyObject*
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3465 ast2obj_arg(void* _o)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3466 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3467 arg_ty o = (arg_ty)_o;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3468 PyObject result = NULL, value = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3469 if (!o) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3470 Py_INCREF(Py_None);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3471 return Py_None;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3472 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3473
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3474 result = PyType_GenericNew(arg_type, NULL, NULL);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3475 if (!result) return NULL;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3476 value = ast2obj_identifier(o->arg);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3477 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3478 if (_PyObject_SetAttrId(result, &PyId_arg, value) == -1)
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3479 goto failed;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3480 Py_DECREF(value);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3481 value = ast2obj_expr(o->annotation);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3482 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3483 if (_PyObject_SetAttrId(result, &PyId_annotation, value) == -1)
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3484 goto failed;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3485 Py_DECREF(value);
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3486 value = ast2obj_int(o->lineno);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3487 if (!value) goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3488 if (_PyObject_SetAttrId(result, &PyId_lineno, value) < 0)
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3489 goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3490 Py_DECREF(value);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3491 value = ast2obj_int(o->col_offset);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3492 if (!value) goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3493 if (_PyObject_SetAttrId(result, &PyId_col_offset, value) < 0)
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3494 goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3495 Py_DECREF(value);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3496 return result;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3497 failed:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3498 Py_XDECREF(value);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3499 Py_XDECREF(result);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3500 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3501 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3502
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3503 PyObject*
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3504 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	3505 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3506 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	3507 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	3508 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3509 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	3510 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3511 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3512
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3513 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	3514 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	3515 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	3516 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3517 if (_PyObject_SetAttrId(result, &PyId_arg, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3518 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3519 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3520 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	3521 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3522 if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3523 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3524 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3525 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3526 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3527 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3528 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3529 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3530 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3531
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3532 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3533 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	3534 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3535 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	3536 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	3537 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3538 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	3539 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3540 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3541
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3542 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	3543 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	3544 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	3545 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3546 if (_PyObject_SetAttrId(result, &PyId_name, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3547 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3548 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3549 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	3550 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3551 if (_PyObject_SetAttrId(result, &PyId_asname, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3552 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3553 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3554 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3555 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3556 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3557 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3558 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3559 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3560
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3561 PyObject*
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3562 ast2obj_withitem(void* _o)
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3563 {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3564 withitem_ty o = (withitem_ty)_o;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3565 PyObject result = NULL, value = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3566 if (!o) {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3567 Py_INCREF(Py_None);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3568 return Py_None;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3569 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3570
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3571 result = PyType_GenericNew(withitem_type, NULL, NULL);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3572 if (!result) return NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3573 value = ast2obj_expr(o->context_expr);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3574 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3575 if (_PyObject_SetAttrId(result, &PyId_context_expr, value) == -1)
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3576 goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3577 Py_DECREF(value);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3578 value = ast2obj_expr(o->optional_vars);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3579 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3580 if (_PyObject_SetAttrId(result, &PyId_optional_vars, value) == -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3581 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3582 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3583 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3584 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3585 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3586 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3587 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3588 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3589
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3590
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3591 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3592 obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3593 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	3594 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	3595
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	3596 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3597
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3598 if (obj == Py_None) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3599 *out = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3600 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3601 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3602 isinstance = PyObject_IsInstance(obj, (PyObject*)Module_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3603 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3604 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3605 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3606 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3607 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3608
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3609 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3610 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3611 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3612 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3613 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3614 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3615 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3616 PyErr_Format(PyExc_TypeError, "Module field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3617 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3618 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3619 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3620 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3621 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3622 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3623 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3624 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3625 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3626 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3627 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3628 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3629 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3630 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3631 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Module");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3632 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3633 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3634 *out = Module(body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3635 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3636 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3637 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3638 isinstance = PyObject_IsInstance(obj, (PyObject*)Interactive_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3639 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3640 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3641 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3642 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3643 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3644
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3645 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3646 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3647 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3648 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3649 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3650 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3651 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3652 PyErr_Format(PyExc_TypeError, "Interactive field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3653 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3654 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3655 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3656 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3657 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3658 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3659 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3660 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3661 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3662 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3663 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3664 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3665 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3666 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3667 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Interactive");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3668 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3669 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3670 *out = Interactive(body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3671 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3672 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3673 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3674 isinstance = PyObject_IsInstance(obj, (PyObject*)Expression_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3675 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3676 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3677 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3678 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3679 expr_ty body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3680
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3681 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3682 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3683 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3684 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3685 res = obj2ast_expr(tmp, &body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3686 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3687 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3688 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3689 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3690 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Expression");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3691 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3692 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3693 *out = Expression(body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3694 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3695 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3696 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3697 isinstance = PyObject_IsInstance(obj, (PyObject*)Suite_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3698 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3699 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3700 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3701 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3702 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3703
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3704 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3705 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3706 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3707 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3708 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3709 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3710 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3711 PyErr_Format(PyExc_TypeError, "Suite field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3712 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3713 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3714 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3715 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3716 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3717 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3718 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3719 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3720 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3721 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3722 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3723 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3724 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3725 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3726 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Suite");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3727 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3728 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3729 *out = Suite(body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3730 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3731 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3732 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3733
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	3734 PyErr_Format(PyExc_TypeError, "expected some sort of mod, but got %R", obj);
350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	3735 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	3736 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3737 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3738 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3739
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3740 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3741 obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3742 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	3743 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	3744
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	3745 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3746 int lineno;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3747 int col_offset;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3748
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3749 if (obj == Py_None) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3750 *out = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3751 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3752 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3753 if (_PyObject_HasAttrId(obj, &PyId_lineno)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3754 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3755 tmp = _PyObject_GetAttrId(obj, &PyId_lineno);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3756 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3757 res = obj2ast_int(tmp, &lineno, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3758 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3759 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3760 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3761 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3762 PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from stmt");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3763 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3764 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3765 if (_PyObject_HasAttrId(obj, &PyId_col_offset)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3766 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3767 tmp = _PyObject_GetAttrId(obj, &PyId_col_offset);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3768 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3769 res = obj2ast_int(tmp, &col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3770 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3771 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3772 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3773 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3774 PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from stmt");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3775 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3776 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3777 isinstance = PyObject_IsInstance(obj, (PyObject*)FunctionDef_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3778 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3779 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3780 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3781 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3782 identifier name;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3783 arguments_ty args;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3784 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3785 asdl_seq* decorator_list;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3786 expr_ty returns;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3787
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3788 if (_PyObject_HasAttrId(obj, &PyId_name)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3789 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3790 tmp = _PyObject_GetAttrId(obj, &PyId_name);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3791 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3792 res = obj2ast_identifier(tmp, &name, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3793 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3794 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3795 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3796 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3797 PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from FunctionDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3798 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3799 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3800 if (_PyObject_HasAttrId(obj, &PyId_args)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3801 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3802 tmp = _PyObject_GetAttrId(obj, &PyId_args);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3803 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3804 res = obj2ast_arguments(tmp, &args, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3805 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3806 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3807 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3808 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3809 PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from FunctionDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3810 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3811 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3812 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3813 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3814 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3815 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3816 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3817 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3818 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3819 PyErr_Format(PyExc_TypeError, "FunctionDef field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3820 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3821 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3822 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3823 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3824 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3825 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3826 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3827 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3828 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3829 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3830 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3831 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3832 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3833 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3834 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from FunctionDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3835 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3836 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3837 if (_PyObject_HasAttrId(obj, &PyId_decorator_list)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3838 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3839 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3840 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3841 tmp = _PyObject_GetAttrId(obj, &PyId_decorator_list);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3842 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3843 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3844 PyErr_Format(PyExc_TypeError, "FunctionDef field \"decorator_list\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3845 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3846 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3847 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3848 decorator_list = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3849 if (decorator_list == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3850 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3851 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3852 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3853 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3854 asdl_seq_SET(decorator_list, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3855 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3856 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3857 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3858 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3859 PyErr_SetString(PyExc_TypeError, "required field \"decorator_list\" missing from FunctionDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3860 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3861 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	3862 if (exists_not_none(obj, &PyId_returns)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3863 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3864 tmp = _PyObject_GetAttrId(obj, &PyId_returns);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3865 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3866 res = obj2ast_expr(tmp, &returns, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3867 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3868 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3869 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3870 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3871 returns = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3872 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3873 *out = FunctionDef(name, args, body, decorator_list, returns,
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3874 lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3875 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3876 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3877 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3878 isinstance = PyObject_IsInstance(obj, (PyObject*)ClassDef_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3879 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3880 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3881 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3882 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3883 identifier name;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3884 asdl_seq* bases;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3885 asdl_seq* keywords;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3886 expr_ty starargs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3887 expr_ty kwargs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3888 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3889 asdl_seq* decorator_list;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3890
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3891 if (_PyObject_HasAttrId(obj, &PyId_name)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3892 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3893 tmp = _PyObject_GetAttrId(obj, &PyId_name);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3894 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3895 res = obj2ast_identifier(tmp, &name, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3896 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3897 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3898 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3899 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3900 PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from ClassDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3901 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3902 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3903 if (_PyObject_HasAttrId(obj, &PyId_bases)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3904 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3905 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3906 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3907 tmp = _PyObject_GetAttrId(obj, &PyId_bases);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3908 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3909 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3910 PyErr_Format(PyExc_TypeError, "ClassDef field \"bases\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3911 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3912 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3913 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3914 bases = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3915 if (bases == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3916 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3917 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3918 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3919 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3920 asdl_seq_SET(bases, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3921 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3922 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3923 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3924 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3925 PyErr_SetString(PyExc_TypeError, "required field \"bases\" missing from ClassDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3926 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3927 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3928 if (_PyObject_HasAttrId(obj, &PyId_keywords)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3929 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3930 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3931 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3932 tmp = _PyObject_GetAttrId(obj, &PyId_keywords);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3933 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3934 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3935 PyErr_Format(PyExc_TypeError, "ClassDef field \"keywords\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3936 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3937 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3938 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3939 keywords = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3940 if (keywords == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3941 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3942 keyword_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3943 res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3944 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3945 asdl_seq_SET(keywords, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3946 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3947 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3948 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3949 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3950 PyErr_SetString(PyExc_TypeError, "required field \"keywords\" missing from ClassDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3951 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3952 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	3953 if (exists_not_none(obj, &PyId_starargs)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3954 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3955 tmp = _PyObject_GetAttrId(obj, &PyId_starargs);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3956 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3957 res = obj2ast_expr(tmp, &starargs, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3958 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3959 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3960 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3961 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3962 starargs = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3963 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	3964 if (exists_not_none(obj, &PyId_kwargs)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3965 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3966 tmp = _PyObject_GetAttrId(obj, &PyId_kwargs);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3967 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3968 res = obj2ast_expr(tmp, &kwargs, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3969 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3970 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3971 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3972 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3973 kwargs = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3974 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3975 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3976 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3977 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3978 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3979 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3980 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3981 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3982 PyErr_Format(PyExc_TypeError, "ClassDef field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3983 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3984 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3985 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3986 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3987 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3988 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3989 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3990 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3991 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3992 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3993 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3994 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3995 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3996 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3997 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from ClassDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3998 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3999 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4000 if (_PyObject_HasAttrId(obj, &PyId_decorator_list)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4001 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4002 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4003 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4004 tmp = _PyObject_GetAttrId(obj, &PyId_decorator_list);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4005 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4006 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4007 PyErr_Format(PyExc_TypeError, "ClassDef field \"decorator_list\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4008 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4009 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4010 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4011 decorator_list = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4012 if (decorator_list == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4013 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4014 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4015 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4016 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4017 asdl_seq_SET(decorator_list, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4018 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4019 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4020 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4021 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4022 PyErr_SetString(PyExc_TypeError, "required field \"decorator_list\" missing from ClassDef");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4023 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4024 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4025 *out = ClassDef(name, bases, keywords, starargs, kwargs, body,
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4026 decorator_list, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4027 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4028 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4029 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4030 isinstance = PyObject_IsInstance(obj, (PyObject*)Return_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4031 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4032 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4033 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4034 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4035 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4036
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	4037 if (exists_not_none(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4038 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4039 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4040 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4041 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4042 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4043 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4044 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4045 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4046 value = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4047 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4048 *out = Return(value, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4049 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4050 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4051 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4052 isinstance = PyObject_IsInstance(obj, (PyObject*)Delete_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4053 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4054 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4055 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4056 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4057 asdl_seq* targets;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4058
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4059 if (_PyObject_HasAttrId(obj, &PyId_targets)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4060 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4061 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4062 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4063 tmp = _PyObject_GetAttrId(obj, &PyId_targets);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4064 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4065 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4066 PyErr_Format(PyExc_TypeError, "Delete field \"targets\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4067 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4068 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4069 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4070 targets = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4071 if (targets == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4072 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4073 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4074 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4075 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4076 asdl_seq_SET(targets, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4077 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4078 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4079 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4080 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4081 PyErr_SetString(PyExc_TypeError, "required field \"targets\" missing from Delete");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4082 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4083 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4084 *out = Delete(targets, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4085 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4086 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4087 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4088 isinstance = PyObject_IsInstance(obj, (PyObject*)Assign_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4089 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4090 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4091 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4092 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4093 asdl_seq* targets;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4094 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4095
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4096 if (_PyObject_HasAttrId(obj, &PyId_targets)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4097 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4098 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4099 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4100 tmp = _PyObject_GetAttrId(obj, &PyId_targets);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4101 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4102 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4103 PyErr_Format(PyExc_TypeError, "Assign field \"targets\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4104 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4105 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4106 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4107 targets = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4108 if (targets == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4109 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4110 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4111 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4112 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4113 asdl_seq_SET(targets, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4114 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4115 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4116 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4117 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4118 PyErr_SetString(PyExc_TypeError, "required field \"targets\" missing from Assign");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4119 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4120 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4121 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4122 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4123 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4124 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4125 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4126 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4127 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4128 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4129 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4130 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Assign");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4131 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4132 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4133 *out = Assign(targets, value, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4134 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4135 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4136 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4137 isinstance = PyObject_IsInstance(obj, (PyObject*)AugAssign_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4138 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4139 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4140 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4141 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4142 expr_ty target;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4143 operator_ty op;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4144 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4145
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4146 if (_PyObject_HasAttrId(obj, &PyId_target)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4147 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4148 tmp = _PyObject_GetAttrId(obj, &PyId_target);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4149 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4150 res = obj2ast_expr(tmp, &target, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4151 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4152 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4153 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4154 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4155 PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from AugAssign");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4156 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4157 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4158 if (_PyObject_HasAttrId(obj, &PyId_op)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4159 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4160 tmp = _PyObject_GetAttrId(obj, &PyId_op);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4161 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4162 res = obj2ast_operator(tmp, &op, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4163 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4164 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4165 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4166 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4167 PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from AugAssign");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4168 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4169 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4170 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4171 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4172 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4173 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4174 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4175 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4176 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4177 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4178 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4179 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from AugAssign");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4180 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4181 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4182 *out = AugAssign(target, op, value, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4183 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4184 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4185 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4186 isinstance = PyObject_IsInstance(obj, (PyObject*)For_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4187 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4188 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4189 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4190 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4191 expr_ty target;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4192 expr_ty iter;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4193 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4194 asdl_seq* orelse;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4195
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4196 if (_PyObject_HasAttrId(obj, &PyId_target)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4197 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4198 tmp = _PyObject_GetAttrId(obj, &PyId_target);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4199 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4200 res = obj2ast_expr(tmp, &target, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4201 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4202 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4203 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4204 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4205 PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from For");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4206 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4207 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4208 if (_PyObject_HasAttrId(obj, &PyId_iter)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4209 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4210 tmp = _PyObject_GetAttrId(obj, &PyId_iter);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4211 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4212 res = obj2ast_expr(tmp, &iter, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4213 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4214 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4215 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4216 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4217 PyErr_SetString(PyExc_TypeError, "required field \"iter\" missing from For");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4218 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4219 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4220 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4221 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4222 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4223 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4224 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4225 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4226 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4227 PyErr_Format(PyExc_TypeError, "For field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4228 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4229 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4230 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4231 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4232 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4233 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4234 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4235 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4236 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4237 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4238 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4239 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4240 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4241 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4242 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from For");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4243 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4244 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4245 if (_PyObject_HasAttrId(obj, &PyId_orelse)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4246 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4247 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4248 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4249 tmp = _PyObject_GetAttrId(obj, &PyId_orelse);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4250 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4251 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4252 PyErr_Format(PyExc_TypeError, "For field \"orelse\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4253 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4254 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4255 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4256 orelse = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4257 if (orelse == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4258 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4259 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4260 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4261 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4262 asdl_seq_SET(orelse, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4263 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4264 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4265 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4266 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4267 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from For");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4268 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4269 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4270 *out = For(target, iter, body, orelse, lineno, col_offset,
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4271 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4272 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4273 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4274 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4275 isinstance = PyObject_IsInstance(obj, (PyObject*)While_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4276 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4277 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4278 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4279 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4280 expr_ty test;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4281 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4282 asdl_seq* orelse;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4283
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4284 if (_PyObject_HasAttrId(obj, &PyId_test)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4285 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4286 tmp = _PyObject_GetAttrId(obj, &PyId_test);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4287 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4288 res = obj2ast_expr(tmp, &test, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4289 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4290 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4291 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4292 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4293 PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from While");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4294 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4295 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4296 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4297 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4298 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4299 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4300 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4301 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4302 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4303 PyErr_Format(PyExc_TypeError, "While field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4304 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4305 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4306 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4307 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4308 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4309 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4310 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4311 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4312 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4313 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4314 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4315 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4316 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4317 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4318 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from While");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4319 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4320 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4321 if (_PyObject_HasAttrId(obj, &PyId_orelse)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4322 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4323 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4324 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4325 tmp = _PyObject_GetAttrId(obj, &PyId_orelse);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4326 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4327 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4328 PyErr_Format(PyExc_TypeError, "While field \"orelse\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4329 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4330 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4331 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4332 orelse = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4333 if (orelse == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4334 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4335 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4336 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4337 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4338 asdl_seq_SET(orelse, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4339 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4340 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4341 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4342 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4343 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from While");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4344 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4345 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4346 *out = While(test, body, orelse, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4347 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4348 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4349 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4350 isinstance = PyObject_IsInstance(obj, (PyObject*)If_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4351 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4352 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4353 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4354 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4355 expr_ty test;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4356 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4357 asdl_seq* orelse;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4358
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4359 if (_PyObject_HasAttrId(obj, &PyId_test)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4360 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4361 tmp = _PyObject_GetAttrId(obj, &PyId_test);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4362 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4363 res = obj2ast_expr(tmp, &test, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4364 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4365 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4366 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4367 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4368 PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from If");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4369 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4370 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4371 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4372 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4373 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4374 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4375 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4376 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4377 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4378 PyErr_Format(PyExc_TypeError, "If field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4379 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4380 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4381 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4382 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4383 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4384 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4385 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4386 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4387 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4388 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4389 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4390 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4391 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4392 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4393 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from If");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4394 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4395 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4396 if (_PyObject_HasAttrId(obj, &PyId_orelse)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4397 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4398 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4399 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4400 tmp = _PyObject_GetAttrId(obj, &PyId_orelse);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4401 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4402 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4403 PyErr_Format(PyExc_TypeError, "If field \"orelse\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4404 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4405 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4406 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4407 orelse = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4408 if (orelse == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4409 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4410 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4411 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4412 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4413 asdl_seq_SET(orelse, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4414 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4415 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4416 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4417 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4418 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from If");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4419 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4420 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4421 *out = If(test, body, orelse, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4422 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4423 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4424 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4425 isinstance = PyObject_IsInstance(obj, (PyObject*)With_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4426 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4427 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4428 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4429 if (isinstance) {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4430 asdl_seq* items;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4431 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4432
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4433 if (_PyObject_HasAttrId(obj, &PyId_items)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4434 int res;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4435 Py_ssize_t len;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4436 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4437 tmp = _PyObject_GetAttrId(obj, &PyId_items);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4438 if (tmp == NULL) goto failed;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4439 if (!PyList_Check(tmp)) {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4440 PyErr_Format(PyExc_TypeError, "With field \"items\" must be a list, not a %.200s", tmp->ob_type->tp_name);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4441 goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4442 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4443 len = PyList_GET_SIZE(tmp);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4444 items = asdl_seq_new(len, arena);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4445 if (items == NULL) goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4446 for (i = 0; i < len; i++) {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4447 withitem_ty value;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4448 res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &value, arena);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4449 if (res != 0) goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4450 asdl_seq_SET(items, i, value);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4451 }
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4452 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4453 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4454 } else {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4455 PyErr_SetString(PyExc_TypeError, "required field \"items\" missing from With");
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4456 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4457 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4458 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4459 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4460 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4461 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4462 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4463 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4464 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4465 PyErr_Format(PyExc_TypeError, "With field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4466 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4467 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4468 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4469 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4470 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4471 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4472 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4473 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4474 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4475 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4476 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4477 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4478 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4479 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4480 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from With");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4481 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4482 }
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4483 *out = With(items, body, lineno, col_offset, arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4484 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4485 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4486 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4487 isinstance = PyObject_IsInstance(obj, (PyObject*)Raise_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4488 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4489 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4490 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4491 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4492 expr_ty exc;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4493 expr_ty cause;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4494
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	4495 if (exists_not_none(obj, &PyId_exc)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4496 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4497 tmp = _PyObject_GetAttrId(obj, &PyId_exc);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4498 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4499 res = obj2ast_expr(tmp, &exc, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4500 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4501 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4502 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4503 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4504 exc = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4505 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	4506 if (exists_not_none(obj, &PyId_cause)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4507 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4508 tmp = _PyObject_GetAttrId(obj, &PyId_cause);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4509 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4510 res = obj2ast_expr(tmp, &cause, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4511 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4512 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4513 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4514 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4515 cause = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4516 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4517 *out = Raise(exc, cause, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4518 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4519 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4520 }
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4521 isinstance = PyObject_IsInstance(obj, (PyObject*)Try_type);
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4522 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4523 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4524 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4525 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4526 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4527 asdl_seq* handlers;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4528 asdl_seq* orelse;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4529 asdl_seq* finalbody;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4530
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4531 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4532 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4533 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4534 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4535 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4536 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4537 if (!PyList_Check(tmp)) {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4538 PyErr_Format(PyExc_TypeError, "Try field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4539 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4540 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4541 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4542 body = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4543 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4544 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4545 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4546 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4547 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4548 asdl_seq_SET(body, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4549 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4550 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4551 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4552 } else {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4553 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Try");
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4554 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4555 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4556 if (_PyObject_HasAttrId(obj, &PyId_handlers)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4557 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4558 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4559 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4560 tmp = _PyObject_GetAttrId(obj, &PyId_handlers);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4561 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4562 if (!PyList_Check(tmp)) {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4563 PyErr_Format(PyExc_TypeError, "Try field \"handlers\" must be a list, not a %.200s", tmp->ob_type->tp_name);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4564 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4565 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4566 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4567 handlers = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4568 if (handlers == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4569 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4570 excepthandler_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4571 res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4572 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4573 asdl_seq_SET(handlers, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4574 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4575 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4576 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4577 } else {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4578 PyErr_SetString(PyExc_TypeError, "required field \"handlers\" missing from Try");
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4579 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4580 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4581 if (_PyObject_HasAttrId(obj, &PyId_orelse)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4582 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4583 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4584 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4585 tmp = _PyObject_GetAttrId(obj, &PyId_orelse);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4586 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4587 if (!PyList_Check(tmp)) {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4588 PyErr_Format(PyExc_TypeError, "Try field \"orelse\" must be a list, not a %.200s", tmp->ob_type->tp_name);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4589 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4590 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4591 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4592 orelse = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4593 if (orelse == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4594 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4595 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4596 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4597 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4598 asdl_seq_SET(orelse, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4599 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4600 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4601 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4602 } else {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4603 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from Try");
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4604 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4605 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4606 if (_PyObject_HasAttrId(obj, &PyId_finalbody)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4607 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4608 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4609 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4610 tmp = _PyObject_GetAttrId(obj, &PyId_finalbody);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4611 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4612 if (!PyList_Check(tmp)) {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4613 PyErr_Format(PyExc_TypeError, "Try field \"finalbody\" must be a list, not a %.200s", tmp->ob_type->tp_name);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4614 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4615 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4616 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4617 finalbody = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4618 if (finalbody == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4619 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4620 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4621 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4622 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4623 asdl_seq_SET(finalbody, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4624 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4625 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4626 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4627 } else {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4628 PyErr_SetString(PyExc_TypeError, "required field \"finalbody\" missing from Try");
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4629 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4630 }
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4631 *out = Try(body, handlers, orelse, finalbody, lineno,
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4632 col_offset, arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4633 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4634 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4635 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4636 isinstance = PyObject_IsInstance(obj, (PyObject*)Assert_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4637 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4638 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4639 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4640 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4641 expr_ty test;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4642 expr_ty msg;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4643
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4644 if (_PyObject_HasAttrId(obj, &PyId_test)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4645 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4646 tmp = _PyObject_GetAttrId(obj, &PyId_test);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4647 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4648 res = obj2ast_expr(tmp, &test, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4649 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4650 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4651 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4652 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4653 PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from Assert");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4654 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4655 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	4656 if (exists_not_none(obj, &PyId_msg)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4657 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4658 tmp = _PyObject_GetAttrId(obj, &PyId_msg);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4659 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4660 res = obj2ast_expr(tmp, &msg, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4661 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4662 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4663 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4664 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4665 msg = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4666 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4667 *out = Assert(test, msg, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4668 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4669 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4670 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4671 isinstance = PyObject_IsInstance(obj, (PyObject*)Import_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4672 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4673 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4674 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4675 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4676 asdl_seq* names;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4677
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4678 if (_PyObject_HasAttrId(obj, &PyId_names)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4679 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4680 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4681 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4682 tmp = _PyObject_GetAttrId(obj, &PyId_names);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4683 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4684 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4685 PyErr_Format(PyExc_TypeError, "Import field \"names\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4686 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4687 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4688 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4689 names = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4690 if (names == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4691 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4692 alias_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4693 res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4694 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4695 asdl_seq_SET(names, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4696 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4697 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4698 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4699 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4700 PyErr_SetString(PyExc_TypeError, "required field \"names\" missing from Import");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4701 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4702 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4703 *out = Import(names, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4704 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4705 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4706 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4707 isinstance = PyObject_IsInstance(obj, (PyObject*)ImportFrom_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4708 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4709 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4710 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4711 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4712 identifier module;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4713 asdl_seq* names;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4714 int level;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4715
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	4716 if (exists_not_none(obj, &PyId_module)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4717 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4718 tmp = _PyObject_GetAttrId(obj, &PyId_module);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4719 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4720 res = obj2ast_identifier(tmp, &module, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4721 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4722 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4723 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4724 } else {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4725 module = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4726 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4727 if (_PyObject_HasAttrId(obj, &PyId_names)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4728 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4729 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4730 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4731 tmp = _PyObject_GetAttrId(obj, &PyId_names);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4732 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4733 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4734 PyErr_Format(PyExc_TypeError, "ImportFrom field \"names\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4735 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4736 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4737 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4738 names = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4739 if (names == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4740 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4741 alias_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4742 res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4743 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4744 asdl_seq_SET(names, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4745 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4746 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4747 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4748 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4749 PyErr_SetString(PyExc_TypeError, "required field \"names\" missing from ImportFrom");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4750 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4751 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	4752 if (exists_not_none(obj, &PyId_level)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4753 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4754 tmp = _PyObject_GetAttrId(obj, &PyId_level);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4755 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4756 res = obj2ast_int(tmp, &level, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4757 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4758 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4759 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4760 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4761 level = 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4762 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4763 *out = ImportFrom(module, names, level, lineno, col_offset,
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4764 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4765 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4766 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4767 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4768 isinstance = PyObject_IsInstance(obj, (PyObject*)Global_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4769 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4770 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4771 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4772 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4773 asdl_seq* names;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4774
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4775 if (_PyObject_HasAttrId(obj, &PyId_names)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4776 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4777 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4778 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4779 tmp = _PyObject_GetAttrId(obj, &PyId_names);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4780 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4781 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4782 PyErr_Format(PyExc_TypeError, "Global field \"names\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4783 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4784 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4785 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4786 names = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4787 if (names == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4788 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4789 identifier value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4790 res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4791 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4792 asdl_seq_SET(names, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4793 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4794 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4795 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4796 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4797 PyErr_SetString(PyExc_TypeError, "required field \"names\" missing from Global");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4798 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4799 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4800 *out = Global(names, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4801 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4802 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4803 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4804 isinstance = PyObject_IsInstance(obj, (PyObject*)Nonlocal_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4805 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4806 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4807 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4808 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4809 asdl_seq* names;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4810
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4811 if (_PyObject_HasAttrId(obj, &PyId_names)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4812 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4813 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4814 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4815 tmp = _PyObject_GetAttrId(obj, &PyId_names);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4816 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4817 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4818 PyErr_Format(PyExc_TypeError, "Nonlocal field \"names\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4819 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4820 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4821 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4822 names = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4823 if (names == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4824 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4825 identifier value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4826 res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4827 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4828 asdl_seq_SET(names, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4829 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4830 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4831 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4832 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4833 PyErr_SetString(PyExc_TypeError, "required field \"names\" missing from Nonlocal");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4834 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4835 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4836 *out = Nonlocal(names, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4837 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4838 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4839 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4840 isinstance = PyObject_IsInstance(obj, (PyObject*)Expr_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4841 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4842 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4843 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4844 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4845 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4846
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4847 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4848 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4849 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4850 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4851 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4852 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4853 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4854 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4855 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4856 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Expr");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4857 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4858 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4859 *out = Expr(value, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4860 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4861 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4862 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4863 isinstance = PyObject_IsInstance(obj, (PyObject*)Pass_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4864 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4865 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4866 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4867 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4868
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4869 *out = Pass(lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4870 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4871 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4872 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4873 isinstance = PyObject_IsInstance(obj, (PyObject*)Break_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4874 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4875 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4876 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4877 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4878
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4879 *out = Break(lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4880 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4881 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4882 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4883 isinstance = PyObject_IsInstance(obj, (PyObject*)Continue_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4884 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4885 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4886 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4887 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4888
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4889 *out = Continue(lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4890 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4891 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4892 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4893
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	4894 PyErr_Format(PyExc_TypeError, "expected some sort of stmt, but got %R", obj);
350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	4895 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	4896 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4897 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4898 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4899
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4900 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4901 obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4902 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	4903 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	4904
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	4905 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4906 int lineno;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4907 int col_offset;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4908
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4909 if (obj == Py_None) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4910 *out = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4911 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4912 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4913 if (_PyObject_HasAttrId(obj, &PyId_lineno)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4914 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4915 tmp = _PyObject_GetAttrId(obj, &PyId_lineno);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4916 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4917 res = obj2ast_int(tmp, &lineno, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4918 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4919 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4920 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4921 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4922 PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from expr");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4923 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4924 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4925 if (_PyObject_HasAttrId(obj, &PyId_col_offset)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4926 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4927 tmp = _PyObject_GetAttrId(obj, &PyId_col_offset);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4928 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4929 res = obj2ast_int(tmp, &col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4930 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4931 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4932 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4933 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4934 PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from expr");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4935 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4936 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4937 isinstance = PyObject_IsInstance(obj, (PyObject*)BoolOp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4938 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4939 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4940 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4941 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4942 boolop_ty op;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4943 asdl_seq* values;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4944
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4945 if (_PyObject_HasAttrId(obj, &PyId_op)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4946 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4947 tmp = _PyObject_GetAttrId(obj, &PyId_op);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4948 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4949 res = obj2ast_boolop(tmp, &op, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4950 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4951 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4952 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4953 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4954 PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from BoolOp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4955 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4956 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4957 if (_PyObject_HasAttrId(obj, &PyId_values)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4958 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4959 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4960 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4961 tmp = _PyObject_GetAttrId(obj, &PyId_values);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4962 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4963 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4964 PyErr_Format(PyExc_TypeError, "BoolOp field \"values\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4965 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4966 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4967 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4968 values = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4969 if (values == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4970 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4971 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4972 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4973 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4974 asdl_seq_SET(values, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4975 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4976 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4977 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4978 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4979 PyErr_SetString(PyExc_TypeError, "required field \"values\" missing from BoolOp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4980 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4981 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4982 *out = BoolOp(op, values, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4983 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4984 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4985 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4986 isinstance = PyObject_IsInstance(obj, (PyObject*)BinOp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4987 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4988 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4989 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4990 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4991 expr_ty left;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4992 operator_ty op;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4993 expr_ty right;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4994
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4995 if (_PyObject_HasAttrId(obj, &PyId_left)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4996 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4997 tmp = _PyObject_GetAttrId(obj, &PyId_left);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4998 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4999 res = obj2ast_expr(tmp, &left, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5000 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5001 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5002 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5003 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5004 PyErr_SetString(PyExc_TypeError, "required field \"left\" missing from BinOp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5005 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5006 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5007 if (_PyObject_HasAttrId(obj, &PyId_op)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5008 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5009 tmp = _PyObject_GetAttrId(obj, &PyId_op);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5010 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5011 res = obj2ast_operator(tmp, &op, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5012 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5013 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5014 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5015 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5016 PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from BinOp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5017 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5018 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5019 if (_PyObject_HasAttrId(obj, &PyId_right)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5020 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5021 tmp = _PyObject_GetAttrId(obj, &PyId_right);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5022 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5023 res = obj2ast_expr(tmp, &right, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5024 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5025 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5026 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5027 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5028 PyErr_SetString(PyExc_TypeError, "required field \"right\" missing from BinOp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5029 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5030 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5031 *out = BinOp(left, op, right, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5032 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5033 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5034 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5035 isinstance = PyObject_IsInstance(obj, (PyObject*)UnaryOp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5036 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5037 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5038 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5039 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5040 unaryop_ty op;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5041 expr_ty operand;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5042
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5043 if (_PyObject_HasAttrId(obj, &PyId_op)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5044 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5045 tmp = _PyObject_GetAttrId(obj, &PyId_op);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5046 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5047 res = obj2ast_unaryop(tmp, &op, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5048 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5049 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5050 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5051 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5052 PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from UnaryOp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5053 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5054 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5055 if (_PyObject_HasAttrId(obj, &PyId_operand)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5056 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5057 tmp = _PyObject_GetAttrId(obj, &PyId_operand);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5058 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5059 res = obj2ast_expr(tmp, &operand, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5060 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5061 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5062 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5063 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5064 PyErr_SetString(PyExc_TypeError, "required field \"operand\" missing from UnaryOp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5065 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5066 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5067 *out = UnaryOp(op, operand, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5068 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5069 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5070 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5071 isinstance = PyObject_IsInstance(obj, (PyObject*)Lambda_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5072 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5073 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5074 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5075 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5076 arguments_ty args;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5077 expr_ty body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5078
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5079 if (_PyObject_HasAttrId(obj, &PyId_args)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5080 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5081 tmp = _PyObject_GetAttrId(obj, &PyId_args);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5082 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5083 res = obj2ast_arguments(tmp, &args, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5084 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5085 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5086 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5087 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5088 PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from Lambda");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5089 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5090 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5091 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5092 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5093 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5094 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5095 res = obj2ast_expr(tmp, &body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5096 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5097 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5098 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5099 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5100 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Lambda");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5101 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5102 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5103 *out = Lambda(args, body, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5104 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5105 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5106 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5107 isinstance = PyObject_IsInstance(obj, (PyObject*)IfExp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5108 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5109 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5110 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5111 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5112 expr_ty test;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5113 expr_ty body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5114 expr_ty orelse;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5115
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5116 if (_PyObject_HasAttrId(obj, &PyId_test)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5117 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5118 tmp = _PyObject_GetAttrId(obj, &PyId_test);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5119 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5120 res = obj2ast_expr(tmp, &test, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5121 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5122 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5123 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5124 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5125 PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from IfExp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5126 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5127 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5128 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5129 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5130 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5131 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5132 res = obj2ast_expr(tmp, &body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5133 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5134 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5135 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5136 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5137 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from IfExp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5138 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5139 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5140 if (_PyObject_HasAttrId(obj, &PyId_orelse)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5141 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5142 tmp = _PyObject_GetAttrId(obj, &PyId_orelse);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5143 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5144 res = obj2ast_expr(tmp, &orelse, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5145 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5146 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5147 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5148 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5149 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from IfExp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5150 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5151 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5152 *out = IfExp(test, body, orelse, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5153 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5154 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5155 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5156 isinstance = PyObject_IsInstance(obj, (PyObject*)Dict_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5157 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5158 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5159 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5160 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5161 asdl_seq* keys;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5162 asdl_seq* values;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5163
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5164 if (_PyObject_HasAttrId(obj, &PyId_keys)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5165 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5166 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5167 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5168 tmp = _PyObject_GetAttrId(obj, &PyId_keys);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5169 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5170 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5171 PyErr_Format(PyExc_TypeError, "Dict field \"keys\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5172 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5173 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5174 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5175 keys = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5176 if (keys == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5177 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5178 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5179 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5180 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5181 asdl_seq_SET(keys, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5182 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5183 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5184 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5185 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5186 PyErr_SetString(PyExc_TypeError, "required field \"keys\" missing from Dict");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5187 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5188 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5189 if (_PyObject_HasAttrId(obj, &PyId_values)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5190 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5191 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5192 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5193 tmp = _PyObject_GetAttrId(obj, &PyId_values);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5194 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5195 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5196 PyErr_Format(PyExc_TypeError, "Dict field \"values\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5197 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5198 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5199 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5200 values = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5201 if (values == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5202 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5203 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5204 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5205 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5206 asdl_seq_SET(values, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5207 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5208 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5209 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5210 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5211 PyErr_SetString(PyExc_TypeError, "required field \"values\" missing from Dict");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5212 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5213 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5214 *out = Dict(keys, values, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5215 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5216 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5217 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5218 isinstance = PyObject_IsInstance(obj, (PyObject*)Set_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5219 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5220 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5221 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5222 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5223 asdl_seq* elts;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5224
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5225 if (_PyObject_HasAttrId(obj, &PyId_elts)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5226 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5227 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5228 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5229 tmp = _PyObject_GetAttrId(obj, &PyId_elts);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5230 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5231 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5232 PyErr_Format(PyExc_TypeError, "Set field \"elts\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5233 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5234 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5235 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5236 elts = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5237 if (elts == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5238 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5239 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5240 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5241 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5242 asdl_seq_SET(elts, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5243 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5244 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5245 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5246 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5247 PyErr_SetString(PyExc_TypeError, "required field \"elts\" missing from Set");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5248 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5249 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5250 *out = Set(elts, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5251 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5252 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5253 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5254 isinstance = PyObject_IsInstance(obj, (PyObject*)ListComp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5255 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5256 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5257 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5258 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5259 expr_ty elt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5260 asdl_seq* generators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5261
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5262 if (_PyObject_HasAttrId(obj, &PyId_elt)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5263 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5264 tmp = _PyObject_GetAttrId(obj, &PyId_elt);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5265 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5266 res = obj2ast_expr(tmp, &elt, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5267 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5268 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5269 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5270 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5271 PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from ListComp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5272 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5273 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5274 if (_PyObject_HasAttrId(obj, &PyId_generators)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5275 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5276 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5277 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5278 tmp = _PyObject_GetAttrId(obj, &PyId_generators);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5279 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5280 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5281 PyErr_Format(PyExc_TypeError, "ListComp field \"generators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5282 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5283 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5284 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5285 generators = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5286 if (generators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5287 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5288 comprehension_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5289 res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5290 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5291 asdl_seq_SET(generators, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5292 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5293 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5294 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5295 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5296 PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from ListComp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5297 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5298 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5299 *out = ListComp(elt, generators, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5300 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5301 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5302 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5303 isinstance = PyObject_IsInstance(obj, (PyObject*)SetComp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5304 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5305 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5306 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5307 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5308 expr_ty elt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5309 asdl_seq* generators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5310
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5311 if (_PyObject_HasAttrId(obj, &PyId_elt)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5312 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5313 tmp = _PyObject_GetAttrId(obj, &PyId_elt);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5314 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5315 res = obj2ast_expr(tmp, &elt, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5316 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5317 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5318 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5319 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5320 PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from SetComp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5321 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5322 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5323 if (_PyObject_HasAttrId(obj, &PyId_generators)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5324 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5325 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5326 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5327 tmp = _PyObject_GetAttrId(obj, &PyId_generators);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5328 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5329 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5330 PyErr_Format(PyExc_TypeError, "SetComp field \"generators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5331 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5332 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5333 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5334 generators = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5335 if (generators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5336 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5337 comprehension_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5338 res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5339 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5340 asdl_seq_SET(generators, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5341 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5342 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5343 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5344 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5345 PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from SetComp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5346 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5347 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5348 *out = SetComp(elt, generators, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5349 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5350 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5351 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5352 isinstance = PyObject_IsInstance(obj, (PyObject*)DictComp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5353 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5354 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5355 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5356 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5357 expr_ty key;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5358 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5359 asdl_seq* generators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5360
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5361 if (_PyObject_HasAttrId(obj, &PyId_key)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5362 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5363 tmp = _PyObject_GetAttrId(obj, &PyId_key);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5364 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5365 res = obj2ast_expr(tmp, &key, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5366 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5367 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5368 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5369 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5370 PyErr_SetString(PyExc_TypeError, "required field \"key\" missing from DictComp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5371 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5372 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5373 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5374 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5375 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5376 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5377 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5378 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5379 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5380 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5381 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5382 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from DictComp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5383 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5384 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5385 if (_PyObject_HasAttrId(obj, &PyId_generators)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5386 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5387 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5388 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5389 tmp = _PyObject_GetAttrId(obj, &PyId_generators);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5390 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5391 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5392 PyErr_Format(PyExc_TypeError, "DictComp field \"generators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5393 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5394 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5395 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5396 generators = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5397 if (generators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5398 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5399 comprehension_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5400 res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5401 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5402 asdl_seq_SET(generators, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5403 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5404 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5405 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5406 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5407 PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from DictComp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5408 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5409 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5410 *out = DictComp(key, value, generators, lineno, col_offset,
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5411 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5412 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5413 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5414 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5415 isinstance = PyObject_IsInstance(obj, (PyObject*)GeneratorExp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5416 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5417 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5418 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5419 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5420 expr_ty elt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5421 asdl_seq* generators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5422
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5423 if (_PyObject_HasAttrId(obj, &PyId_elt)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5424 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5425 tmp = _PyObject_GetAttrId(obj, &PyId_elt);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5426 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5427 res = obj2ast_expr(tmp, &elt, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5428 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5429 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5430 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5431 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5432 PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from GeneratorExp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5433 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5434 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5435 if (_PyObject_HasAttrId(obj, &PyId_generators)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5436 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5437 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5438 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5439 tmp = _PyObject_GetAttrId(obj, &PyId_generators);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5440 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5441 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5442 PyErr_Format(PyExc_TypeError, "GeneratorExp field \"generators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5443 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5444 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5445 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5446 generators = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5447 if (generators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5448 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5449 comprehension_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5450 res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5451 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5452 asdl_seq_SET(generators, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5453 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5454 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5455 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5456 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5457 PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from GeneratorExp");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5458 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5459 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5460 *out = GeneratorExp(elt, generators, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5461 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5462 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5463 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5464 isinstance = PyObject_IsInstance(obj, (PyObject*)Yield_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5465 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5466 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5467 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5468 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5469 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5470
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	5471 if (exists_not_none(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5472 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5473 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5474 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5475 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5476 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5477 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5478 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5479 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5480 value = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5481 }
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5482 *out = Yield(value, lineno, col_offset, arena);
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5483 if (*out == NULL) goto failed;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5484 return 0;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5485 }
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5486 isinstance = PyObject_IsInstance(obj, (PyObject*)YieldFrom_type);
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5487 if (isinstance == -1) {
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5488 return 1;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5489 }
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5490 if (isinstance) {
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5491 expr_ty value;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5492
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5493 if (_PyObject_HasAttrId(obj, &PyId_value)) {
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5494 int res;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5495 tmp = _PyObject_GetAttrId(obj, &PyId_value);
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5496 if (tmp == NULL) goto failed;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5497 res = obj2ast_expr(tmp, &value, arena);
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5498 if (res != 0) goto failed;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5499 Py_XDECREF(tmp);
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5500 tmp = NULL;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5501 } else {
80589 ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	5502 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from YieldFrom");
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	5503 return 1;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5504 }
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5505 *out = YieldFrom(value, lineno, col_offset, arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5506 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5507 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5508 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5509 isinstance = PyObject_IsInstance(obj, (PyObject*)Compare_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5510 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5511 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5512 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5513 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5514 expr_ty left;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5515 asdl_int_seq* ops;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5516 asdl_seq* comparators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5517
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5518 if (_PyObject_HasAttrId(obj, &PyId_left)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5519 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5520 tmp = _PyObject_GetAttrId(obj, &PyId_left);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5521 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5522 res = obj2ast_expr(tmp, &left, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5523 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5524 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5525 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5526 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5527 PyErr_SetString(PyExc_TypeError, "required field \"left\" missing from Compare");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5528 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5529 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5530 if (_PyObject_HasAttrId(obj, &PyId_ops)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5531 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5532 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5533 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5534 tmp = _PyObject_GetAttrId(obj, &PyId_ops);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5535 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5536 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5537 PyErr_Format(PyExc_TypeError, "Compare field \"ops\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5538 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5539 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5540 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5541 ops = asdl_int_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5542 if (ops == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5543 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5544 cmpop_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5545 res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5546 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5547 asdl_seq_SET(ops, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5548 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5549 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5550 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5551 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5552 PyErr_SetString(PyExc_TypeError, "required field \"ops\" missing from Compare");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5553 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5554 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5555 if (_PyObject_HasAttrId(obj, &PyId_comparators)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5556 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5557 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5558 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5559 tmp = _PyObject_GetAttrId(obj, &PyId_comparators);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5560 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5561 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5562 PyErr_Format(PyExc_TypeError, "Compare field \"comparators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5563 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5564 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5565 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5566 comparators = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5567 if (comparators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5568 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5569 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5570 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5571 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5572 asdl_seq_SET(comparators, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5573 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5574 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5575 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5576 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5577 PyErr_SetString(PyExc_TypeError, "required field \"comparators\" missing from Compare");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5578 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5579 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5580 *out = Compare(left, ops, comparators, lineno, col_offset,
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5581 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5582 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5583 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5584 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5585 isinstance = PyObject_IsInstance(obj, (PyObject*)Call_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5586 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5587 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5588 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5589 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5590 expr_ty func;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5591 asdl_seq* args;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5592 asdl_seq* keywords;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5593 expr_ty starargs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5594 expr_ty kwargs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5595
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5596 if (_PyObject_HasAttrId(obj, &PyId_func)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5597 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5598 tmp = _PyObject_GetAttrId(obj, &PyId_func);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5599 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5600 res = obj2ast_expr(tmp, &func, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5601 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5602 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5603 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5604 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5605 PyErr_SetString(PyExc_TypeError, "required field \"func\" missing from Call");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5606 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5607 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5608 if (_PyObject_HasAttrId(obj, &PyId_args)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5609 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5610 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5611 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5612 tmp = _PyObject_GetAttrId(obj, &PyId_args);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5613 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5614 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5615 PyErr_Format(PyExc_TypeError, "Call field \"args\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5616 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5617 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5618 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5619 args = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5620 if (args == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5621 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5622 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5623 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5624 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5625 asdl_seq_SET(args, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5626 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5627 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5628 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5629 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5630 PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from Call");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5631 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5632 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5633 if (_PyObject_HasAttrId(obj, &PyId_keywords)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5634 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5635 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5636 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5637 tmp = _PyObject_GetAttrId(obj, &PyId_keywords);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5638 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5639 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5640 PyErr_Format(PyExc_TypeError, "Call field \"keywords\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5641 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5642 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5643 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5644 keywords = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5645 if (keywords == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5646 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5647 keyword_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5648 res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5649 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5650 asdl_seq_SET(keywords, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5651 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5652 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5653 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5654 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5655 PyErr_SetString(PyExc_TypeError, "required field \"keywords\" missing from Call");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5656 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5657 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	5658 if (exists_not_none(obj, &PyId_starargs)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5659 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5660 tmp = _PyObject_GetAttrId(obj, &PyId_starargs);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5661 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5662 res = obj2ast_expr(tmp, &starargs, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5663 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5664 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5665 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5666 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5667 starargs = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5668 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	5669 if (exists_not_none(obj, &PyId_kwargs)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5670 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5671 tmp = _PyObject_GetAttrId(obj, &PyId_kwargs);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5672 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5673 res = obj2ast_expr(tmp, &kwargs, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5674 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5675 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5676 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5677 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5678 kwargs = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5679 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5680 *out = Call(func, args, keywords, starargs, kwargs, lineno,
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5681 col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5682 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5683 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5684 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5685 isinstance = PyObject_IsInstance(obj, (PyObject*)Num_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5686 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5687 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5688 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5689 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5690 object n;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5691
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5692 if (_PyObject_HasAttrId(obj, &PyId_n)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5693 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5694 tmp = _PyObject_GetAttrId(obj, &PyId_n);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5695 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5696 res = obj2ast_object(tmp, &n, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5697 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5698 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5699 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5700 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5701 PyErr_SetString(PyExc_TypeError, "required field \"n\" missing from Num");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5702 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5703 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5704 *out = Num(n, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5705 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5706 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5707 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5708 isinstance = PyObject_IsInstance(obj, (PyObject*)Str_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5709 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5710 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5711 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5712 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5713 string s;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5714
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5715 if (_PyObject_HasAttrId(obj, &PyId_s)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5716 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5717 tmp = _PyObject_GetAttrId(obj, &PyId_s);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5718 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5719 res = obj2ast_string(tmp, &s, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5720 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5721 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5722 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5723 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5724 PyErr_SetString(PyExc_TypeError, "required field \"s\" missing from Str");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5725 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5726 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5727 *out = Str(s, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5728 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5729 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5730 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5731 isinstance = PyObject_IsInstance(obj, (PyObject*)Bytes_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5732 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5733 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5734 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5735 if (isinstance) {
71792 f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	5736 bytes s;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5737
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5738 if (_PyObject_HasAttrId(obj, &PyId_s)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5739 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5740 tmp = _PyObject_GetAttrId(obj, &PyId_s);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5741 if (tmp == NULL) goto failed;
71792 f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	5742 res = obj2ast_bytes(tmp, &s, arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5743 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5744 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5745 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5746 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5747 PyErr_SetString(PyExc_TypeError, "required field \"s\" missing from Bytes");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5748 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5749 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5750 *out = Bytes(s, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5751 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5752 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5753 }
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5754 isinstance = PyObject_IsInstance(obj, (PyObject*)NameConstant_type);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5755 if (isinstance == -1) {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5756 return 1;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5757 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5758 if (isinstance) {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5759 singleton value;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5760
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5761 if (_PyObject_HasAttrId(obj, &PyId_value)) {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5762 int res;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5763 tmp = _PyObject_GetAttrId(obj, &PyId_value);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5764 if (tmp == NULL) goto failed;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5765 res = obj2ast_singleton(tmp, &value, arena);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5766 if (res != 0) goto failed;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5767 Py_XDECREF(tmp);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5768 tmp = NULL;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5769 } else {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5770 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from NameConstant");
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5771 return 1;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5772 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5773 *out = NameConstant(value, lineno, col_offset, arena);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5774 if (*out == NULL) goto failed;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5775 return 0;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5776 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5777 isinstance = PyObject_IsInstance(obj, (PyObject*)Ellipsis_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5778 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5779 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5780 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5781 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5782
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5783 *out = Ellipsis(lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5784 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5785 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5786 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5787 isinstance = PyObject_IsInstance(obj, (PyObject*)Attribute_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5788 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5789 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5790 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5791 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5792 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5793 identifier attr;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5794 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5795
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5796 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5797 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5798 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5799 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5800 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5801 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5802 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5803 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5804 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5805 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Attribute");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5806 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5807 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5808 if (_PyObject_HasAttrId(obj, &PyId_attr)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5809 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5810 tmp = _PyObject_GetAttrId(obj, &PyId_attr);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5811 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5812 res = obj2ast_identifier(tmp, &attr, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5813 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5814 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5815 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5816 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5817 PyErr_SetString(PyExc_TypeError, "required field \"attr\" missing from Attribute");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5818 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5819 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5820 if (_PyObject_HasAttrId(obj, &PyId_ctx)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5821 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5822 tmp = _PyObject_GetAttrId(obj, &PyId_ctx);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5823 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5824 res = obj2ast_expr_context(tmp, &ctx, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5825 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5826 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5827 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5828 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5829 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Attribute");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5830 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5831 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5832 *out = Attribute(value, attr, ctx, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5833 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5834 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5835 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5836 isinstance = PyObject_IsInstance(obj, (PyObject*)Subscript_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5837 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5838 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5839 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5840 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5841 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5842 slice_ty slice;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5843 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5844
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5845 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5846 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5847 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5848 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5849 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5850 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5851 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5852 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5853 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5854 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Subscript");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5855 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5856 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5857 if (_PyObject_HasAttrId(obj, &PyId_slice)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5858 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5859 tmp = _PyObject_GetAttrId(obj, &PyId_slice);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5860 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5861 res = obj2ast_slice(tmp, &slice, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5862 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5863 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5864 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5865 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5866 PyErr_SetString(PyExc_TypeError, "required field \"slice\" missing from Subscript");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5867 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5868 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5869 if (_PyObject_HasAttrId(obj, &PyId_ctx)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5870 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5871 tmp = _PyObject_GetAttrId(obj, &PyId_ctx);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5872 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5873 res = obj2ast_expr_context(tmp, &ctx, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5874 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5875 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5876 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5877 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5878 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Subscript");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5879 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5880 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5881 *out = Subscript(value, slice, ctx, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5882 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5883 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5884 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5885 isinstance = PyObject_IsInstance(obj, (PyObject*)Starred_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5886 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5887 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5888 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5889 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5890 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5891 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5892
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5893 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5894 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5895 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5896 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5897 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5898 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5899 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5900 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5901 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5902 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Starred");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5903 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5904 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5905 if (_PyObject_HasAttrId(obj, &PyId_ctx)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5906 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5907 tmp = _PyObject_GetAttrId(obj, &PyId_ctx);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5908 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5909 res = obj2ast_expr_context(tmp, &ctx, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5910 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5911 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5912 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5913 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5914 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Starred");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5915 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5916 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5917 *out = Starred(value, ctx, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5918 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5919 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5920 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5921 isinstance = PyObject_IsInstance(obj, (PyObject*)Name_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5922 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5923 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5924 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5925 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5926 identifier id;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5927 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5928
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5929 if (_PyObject_HasAttrId(obj, &PyId_id)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5930 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5931 tmp = _PyObject_GetAttrId(obj, &PyId_id);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5932 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5933 res = obj2ast_identifier(tmp, &id, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5934 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5935 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5936 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5937 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5938 PyErr_SetString(PyExc_TypeError, "required field \"id\" missing from Name");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5939 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5940 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5941 if (_PyObject_HasAttrId(obj, &PyId_ctx)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5942 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5943 tmp = _PyObject_GetAttrId(obj, &PyId_ctx);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5944 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5945 res = obj2ast_expr_context(tmp, &ctx, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5946 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5947 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5948 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5949 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5950 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Name");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5951 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5952 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5953 *out = Name(id, ctx, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5954 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5955 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5956 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5957 isinstance = PyObject_IsInstance(obj, (PyObject*)List_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5958 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5959 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5960 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5961 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5962 asdl_seq* elts;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5963 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5964
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5965 if (_PyObject_HasAttrId(obj, &PyId_elts)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5966 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5967 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5968 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5969 tmp = _PyObject_GetAttrId(obj, &PyId_elts);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5970 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5971 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5972 PyErr_Format(PyExc_TypeError, "List field \"elts\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5973 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5974 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5975 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5976 elts = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5977 if (elts == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5978 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5979 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5980 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5981 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5982 asdl_seq_SET(elts, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5983 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5984 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5985 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5986 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5987 PyErr_SetString(PyExc_TypeError, "required field \"elts\" missing from List");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5988 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5989 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5990 if (_PyObject_HasAttrId(obj, &PyId_ctx)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5991 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5992 tmp = _PyObject_GetAttrId(obj, &PyId_ctx);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5993 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5994 res = obj2ast_expr_context(tmp, &ctx, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5995 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5996 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5997 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5998 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5999 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from List");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6000 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6001 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6002 *out = List(elts, ctx, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6003 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6004 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6005 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6006 isinstance = PyObject_IsInstance(obj, (PyObject*)Tuple_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6007 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6008 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6009 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6010 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6011 asdl_seq* elts;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6012 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6013
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6014 if (_PyObject_HasAttrId(obj, &PyId_elts)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6015 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6016 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6017 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6018 tmp = _PyObject_GetAttrId(obj, &PyId_elts);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6019 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6020 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6021 PyErr_Format(PyExc_TypeError, "Tuple field \"elts\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6022 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6023 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6024 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6025 elts = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6026 if (elts == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6027 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6028 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6029 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6030 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6031 asdl_seq_SET(elts, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6032 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6033 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6034 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6035 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6036 PyErr_SetString(PyExc_TypeError, "required field \"elts\" missing from Tuple");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6037 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6038 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6039 if (_PyObject_HasAttrId(obj, &PyId_ctx)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6040 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6041 tmp = _PyObject_GetAttrId(obj, &PyId_ctx);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6042 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6043 res = obj2ast_expr_context(tmp, &ctx, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6044 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6045 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6046 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6047 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6048 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Tuple");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6049 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6050 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6051 *out = Tuple(elts, ctx, lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6052 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6053 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6054 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6055
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6056 PyErr_Format(PyExc_TypeError, "expected some sort of expr, but got %R", obj);
350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6057 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	6058 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6059 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6060 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6061
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6062 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6063 obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6064 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6065 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6066
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6067 isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6068 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6069 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6070 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6071 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6072 *out = Load;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6073 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6074 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6075 isinstance = PyObject_IsInstance(obj, (PyObject *)Store_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6076 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6077 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6078 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6079 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6080 *out = Store;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6081 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6082 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6083 isinstance = PyObject_IsInstance(obj, (PyObject *)Del_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6084 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6085 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6086 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6087 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6088 *out = Del;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6089 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6090 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6091 isinstance = PyObject_IsInstance(obj, (PyObject *)AugLoad_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6092 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6093 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6094 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6095 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6096 *out = AugLoad;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6097 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6098 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6099 isinstance = PyObject_IsInstance(obj, (PyObject *)AugStore_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6100 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6101 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6102 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6103 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6104 *out = AugStore;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6105 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6106 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6107 isinstance = PyObject_IsInstance(obj, (PyObject *)Param_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6108 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6109 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6110 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6111 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6112 *out = Param;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6113 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6114 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6115
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6116 PyErr_Format(PyExc_TypeError, "expected some sort of expr_context, but got %R", obj);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6117 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6118 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6119
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6120 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6121 obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6122 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6123 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	6124
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	6125 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6126
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6127 if (obj == Py_None) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6128 *out = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6129 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6130 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6131 isinstance = PyObject_IsInstance(obj, (PyObject*)Slice_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6132 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6133 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6134 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6135 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6136 expr_ty lower;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6137 expr_ty upper;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6138 expr_ty step;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6139
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6140 if (exists_not_none(obj, &PyId_lower)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6141 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6142 tmp = _PyObject_GetAttrId(obj, &PyId_lower);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6143 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6144 res = obj2ast_expr(tmp, &lower, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6145 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6146 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6147 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6148 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6149 lower = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6150 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6151 if (exists_not_none(obj, &PyId_upper)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6152 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6153 tmp = _PyObject_GetAttrId(obj, &PyId_upper);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6154 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6155 res = obj2ast_expr(tmp, &upper, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6156 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6157 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6158 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6159 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6160 upper = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6161 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6162 if (exists_not_none(obj, &PyId_step)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6163 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6164 tmp = _PyObject_GetAttrId(obj, &PyId_step);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6165 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6166 res = obj2ast_expr(tmp, &step, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6167 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6168 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6169 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6170 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6171 step = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6172 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6173 *out = Slice(lower, upper, step, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6174 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6175 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6176 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6177 isinstance = PyObject_IsInstance(obj, (PyObject*)ExtSlice_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6178 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6179 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6180 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6181 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6182 asdl_seq* dims;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6183
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6184 if (_PyObject_HasAttrId(obj, &PyId_dims)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6185 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6186 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6187 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6188 tmp = _PyObject_GetAttrId(obj, &PyId_dims);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6189 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6190 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6191 PyErr_Format(PyExc_TypeError, "ExtSlice field \"dims\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6192 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6193 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6194 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6195 dims = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6196 if (dims == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6197 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6198 slice_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6199 res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6200 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6201 asdl_seq_SET(dims, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6202 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6203 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6204 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6205 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6206 PyErr_SetString(PyExc_TypeError, "required field \"dims\" missing from ExtSlice");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6207 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6208 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6209 *out = ExtSlice(dims, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6210 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6211 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6212 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6213 isinstance = PyObject_IsInstance(obj, (PyObject*)Index_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6214 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6215 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6216 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6217 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6218 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6219
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6220 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6221 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6222 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6223 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6224 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6225 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6226 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6227 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6228 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6229 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Index");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6230 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6231 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6232 *out = Index(value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6233 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6234 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6235 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6236
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6237 PyErr_Format(PyExc_TypeError, "expected some sort of slice, but got %R", obj);
350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6238 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	6239 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6240 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6241 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6242
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6243 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6244 obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6245 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6246 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6247
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6248 isinstance = PyObject_IsInstance(obj, (PyObject *)And_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6249 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6250 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6251 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6252 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6253 *out = And;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6254 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6255 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6256 isinstance = PyObject_IsInstance(obj, (PyObject *)Or_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6257 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6258 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6259 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6260 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6261 *out = Or;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6262 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6263 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6264
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6265 PyErr_Format(PyExc_TypeError, "expected some sort of boolop, but got %R", obj);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6266 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6267 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6268
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6269 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6270 obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6271 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6272 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6273
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6274 isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6275 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6276 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6277 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6278 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6279 *out = Add;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6280 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6281 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6282 isinstance = PyObject_IsInstance(obj, (PyObject *)Sub_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6283 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6284 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6285 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6286 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6287 *out = Sub;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6288 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6289 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6290 isinstance = PyObject_IsInstance(obj, (PyObject *)Mult_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6291 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6292 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6293 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6294 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6295 *out = Mult;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6296 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6297 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6298 isinstance = PyObject_IsInstance(obj, (PyObject *)Div_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6299 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6300 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6301 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6302 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6303 *out = Div;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6304 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6305 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6306 isinstance = PyObject_IsInstance(obj, (PyObject *)Mod_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6307 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6308 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6309 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6310 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6311 *out = Mod;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6312 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6313 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6314 isinstance = PyObject_IsInstance(obj, (PyObject *)Pow_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6315 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6316 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6317 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6318 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6319 *out = Pow;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6320 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6321 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6322 isinstance = PyObject_IsInstance(obj, (PyObject *)LShift_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6323 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6324 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6325 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6326 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6327 *out = LShift;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6328 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6329 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6330 isinstance = PyObject_IsInstance(obj, (PyObject *)RShift_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6331 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6332 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6333 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6334 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6335 *out = RShift;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6336 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6337 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6338 isinstance = PyObject_IsInstance(obj, (PyObject *)BitOr_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6339 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6340 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6341 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6342 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6343 *out = BitOr;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6344 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6345 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6346 isinstance = PyObject_IsInstance(obj, (PyObject *)BitXor_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6347 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6348 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6349 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6350 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6351 *out = BitXor;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6352 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6353 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6354 isinstance = PyObject_IsInstance(obj, (PyObject *)BitAnd_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6355 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6356 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6357 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6358 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6359 *out = BitAnd;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6360 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6361 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6362 isinstance = PyObject_IsInstance(obj, (PyObject *)FloorDiv_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6363 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6364 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6365 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6366 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6367 *out = FloorDiv;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6368 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6369 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6370
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6371 PyErr_Format(PyExc_TypeError, "expected some sort of operator, but got %R", obj);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6372 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6373 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6374
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6375 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6376 obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6377 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6378 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6379
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6380 isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6381 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6382 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6383 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6384 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6385 *out = Invert;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6386 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6387 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6388 isinstance = PyObject_IsInstance(obj, (PyObject *)Not_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6389 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6390 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6391 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6392 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6393 *out = Not;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6394 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6395 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6396 isinstance = PyObject_IsInstance(obj, (PyObject *)UAdd_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6397 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6398 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6399 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6400 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6401 *out = UAdd;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6402 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6403 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6404 isinstance = PyObject_IsInstance(obj, (PyObject *)USub_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6405 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6406 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6407 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6408 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6409 *out = USub;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6410 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6411 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6412
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6413 PyErr_Format(PyExc_TypeError, "expected some sort of unaryop, but got %R", obj);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6414 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6415 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6416
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6417 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6418 obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6419 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6420 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6421
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6422 isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6423 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6424 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6425 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6426 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6427 *out = Eq;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6428 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6429 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6430 isinstance = PyObject_IsInstance(obj, (PyObject *)NotEq_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6431 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6432 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6433 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6434 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6435 *out = NotEq;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6436 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6437 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6438 isinstance = PyObject_IsInstance(obj, (PyObject *)Lt_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6439 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6440 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6441 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6442 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6443 *out = Lt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6444 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6445 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6446 isinstance = PyObject_IsInstance(obj, (PyObject *)LtE_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6447 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6448 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6449 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6450 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6451 *out = LtE;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6452 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6453 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6454 isinstance = PyObject_IsInstance(obj, (PyObject *)Gt_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6455 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6456 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6457 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6458 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6459 *out = Gt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6460 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6461 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6462 isinstance = PyObject_IsInstance(obj, (PyObject *)GtE_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6463 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6464 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6465 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6466 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6467 *out = GtE;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6468 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6469 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6470 isinstance = PyObject_IsInstance(obj, (PyObject *)Is_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6471 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6472 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6473 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6474 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6475 *out = Is;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6476 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6477 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6478 isinstance = PyObject_IsInstance(obj, (PyObject *)IsNot_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6479 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6480 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6481 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6482 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6483 *out = IsNot;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6484 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6485 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6486 isinstance = PyObject_IsInstance(obj, (PyObject *)In_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6487 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6488 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6489 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6490 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6491 *out = In;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6492 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6493 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6494 isinstance = PyObject_IsInstance(obj, (PyObject *)NotIn_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6495 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6496 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6497 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6498 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6499 *out = NotIn;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6500 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6501 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6502
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6503 PyErr_Format(PyExc_TypeError, "expected some sort of cmpop, but got %R", obj);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6504 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6505 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6506
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6507 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6508 obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6509 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6510 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6511 expr_ty target;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6512 expr_ty iter;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6513 asdl_seq* ifs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6514
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6515 if (_PyObject_HasAttrId(obj, &PyId_target)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6516 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6517 tmp = _PyObject_GetAttrId(obj, &PyId_target);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6518 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6519 res = obj2ast_expr(tmp, &target, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6520 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6521 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6522 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6523 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6524 PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from comprehension");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6525 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6526 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6527 if (_PyObject_HasAttrId(obj, &PyId_iter)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6528 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6529 tmp = _PyObject_GetAttrId(obj, &PyId_iter);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6530 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6531 res = obj2ast_expr(tmp, &iter, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6532 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6533 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6534 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6535 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6536 PyErr_SetString(PyExc_TypeError, "required field \"iter\" missing from comprehension");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6537 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6538 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6539 if (_PyObject_HasAttrId(obj, &PyId_ifs)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6540 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6541 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6542 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6543 tmp = _PyObject_GetAttrId(obj, &PyId_ifs);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6544 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6545 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6546 PyErr_Format(PyExc_TypeError, "comprehension field \"ifs\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6547 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6548 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6549 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6550 ifs = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6551 if (ifs == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6552 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6553 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6554 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6555 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6556 asdl_seq_SET(ifs, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6557 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6558 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6559 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6560 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6561 PyErr_SetString(PyExc_TypeError, "required field \"ifs\" missing from comprehension");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6562 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6563 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6564 *out = comprehension(target, iter, ifs, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6565 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6566 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6567 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6568 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6569 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6570
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6571 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6572 obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6573 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6574 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	6575
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	6576 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6577 int lineno;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6578 int col_offset;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6579
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6580 if (obj == Py_None) {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6581 *out = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6582 return 0;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6583 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6584 if (_PyObject_HasAttrId(obj, &PyId_lineno)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6585 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6586 tmp = _PyObject_GetAttrId(obj, &PyId_lineno);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6587 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6588 res = obj2ast_int(tmp, &lineno, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6589 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6590 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6591 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6592 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6593 PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from excepthandler");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6594 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6595 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6596 if (_PyObject_HasAttrId(obj, &PyId_col_offset)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6597 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6598 tmp = _PyObject_GetAttrId(obj, &PyId_col_offset);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6599 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6600 res = obj2ast_int(tmp, &col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6601 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6602 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6603 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6604 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6605 PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from excepthandler");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6606 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6607 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6608 isinstance = PyObject_IsInstance(obj, (PyObject*)ExceptHandler_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6609 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6610 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6611 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6612 if (isinstance) {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6613 expr_ty type;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6614 identifier name;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6615 asdl_seq* body;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6616
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6617 if (exists_not_none(obj, &PyId_type)) {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6618 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6619 tmp = _PyObject_GetAttrId(obj, &PyId_type);
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6620 if (tmp == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6621 res = obj2ast_expr(tmp, &type, arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6622 if (res != 0) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6623 Py_XDECREF(tmp);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6624 tmp = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6625 } else {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6626 type = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6627 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6628 if (exists_not_none(obj, &PyId_name)) {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6629 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6630 tmp = _PyObject_GetAttrId(obj, &PyId_name);
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6631 if (tmp == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6632 res = obj2ast_identifier(tmp, &name, arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6633 if (res != 0) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6634 Py_XDECREF(tmp);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6635 tmp = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6636 } else {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6637 name = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6638 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6639 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6640 int res;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6641 Py_ssize_t len;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6642 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6643 tmp = _PyObject_GetAttrId(obj, &PyId_body);
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6644 if (tmp == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6645 if (!PyList_Check(tmp)) {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6646 PyErr_Format(PyExc_TypeError, "ExceptHandler field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6647 goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6648 }
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6649 len = PyList_GET_SIZE(tmp);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6650 body = asdl_seq_new(len, arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6651 if (body == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6652 for (i = 0; i < len; i++) {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6653 stmt_ty value;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6654 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6655 if (res != 0) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6656 asdl_seq_SET(body, i, value);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6657 }
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6658 Py_XDECREF(tmp);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6659 tmp = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6660 } else {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6661 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from ExceptHandler");
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6662 return 1;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6663 }
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6664 *out = ExceptHandler(type, name, body, lineno, col_offset,
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6665 arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6666 if (*out == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6667 return 0;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6668 }
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6669
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6670 PyErr_Format(PyExc_TypeError, "expected some sort of excepthandler, but got %R", obj);
350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6671 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	6672 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6673 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6674 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6675
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6676 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6677 obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6678 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6679 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6680 asdl_seq* args;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6681 arg_ty vararg;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6682 asdl_seq* kwonlyargs;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6683 asdl_seq* kw_defaults;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6684 arg_ty kwarg;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6685 asdl_seq* defaults;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6686
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6687 if (_PyObject_HasAttrId(obj, &PyId_args)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6688 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6689 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6690 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6691 tmp = _PyObject_GetAttrId(obj, &PyId_args);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6692 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6693 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6694 PyErr_Format(PyExc_TypeError, "arguments field \"args\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6695 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6696 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6697 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6698 args = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6699 if (args == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6700 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6701 arg_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6702 res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6703 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6704 asdl_seq_SET(args, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6705 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6706 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6707 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6708 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6709 PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from arguments");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6710 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6711 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6712 if (exists_not_none(obj, &PyId_vararg)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6713 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6714 tmp = _PyObject_GetAttrId(obj, &PyId_vararg);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6715 if (tmp == NULL) goto failed;
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6716 res = obj2ast_arg(tmp, &vararg, arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6717 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6718 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6719 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6720 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6721 vararg = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6722 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6723 if (_PyObject_HasAttrId(obj, &PyId_kwonlyargs)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6724 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6725 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6726 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6727 tmp = _PyObject_GetAttrId(obj, &PyId_kwonlyargs);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6728 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6729 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6730 PyErr_Format(PyExc_TypeError, "arguments field \"kwonlyargs\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6731 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6732 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6733 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6734 kwonlyargs = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6735 if (kwonlyargs == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6736 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6737 arg_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6738 res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6739 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6740 asdl_seq_SET(kwonlyargs, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6741 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6742 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6743 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6744 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6745 PyErr_SetString(PyExc_TypeError, "required field \"kwonlyargs\" missing from arguments");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6746 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6747 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6748 if (_PyObject_HasAttrId(obj, &PyId_kw_defaults)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6749 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6750 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6751 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6752 tmp = _PyObject_GetAttrId(obj, &PyId_kw_defaults);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6753 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6754 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6755 PyErr_Format(PyExc_TypeError, "arguments field \"kw_defaults\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6756 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6757 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6758 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6759 kw_defaults = asdl_seq_new(len, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6760 if (kw_defaults == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6761 for (i = 0; i < len; i++) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6762 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6763 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6764 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6765 asdl_seq_SET(kw_defaults, i, value);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6766 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6767 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6768 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6769 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6770 PyErr_SetString(PyExc_TypeError, "required field \"kw_defaults\" missing from arguments");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6771 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6772 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6773 if (exists_not_none(obj, &PyId_kwarg)) {
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6774 int res;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6775 tmp = _PyObject_GetAttrId(obj, &PyId_kwarg);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6776 if (tmp == NULL) goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6777 res = obj2ast_arg(tmp, &kwarg, arena);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6778 if (res != 0) goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6779 Py_XDECREF(tmp);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6780 tmp = NULL;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6781 } else {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6782 kwarg = NULL;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6783 }
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6784 if (_PyObject_HasAttrId(obj, &PyId_defaults)) {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6785 int res;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6786 Py_ssize_t len;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6787 Py_ssize_t i;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6788 tmp = _PyObject_GetAttrId(obj, &PyId_defaults);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6789 if (tmp == NULL) goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6790 if (!PyList_Check(tmp)) {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6791 PyErr_Format(PyExc_TypeError, "arguments field \"defaults\" must be a list, not a %.200s", tmp->ob_type->tp_name);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6792 goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6793 }
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6794 len = PyList_GET_SIZE(tmp);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6795 defaults = asdl_seq_new(len, arena);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6796 if (defaults == NULL) goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6797 for (i = 0; i < len; i++) {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6798 expr_ty value;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6799 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6800 if (res != 0) goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6801 asdl_seq_SET(defaults, i, value);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6802 }
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6803 Py_XDECREF(tmp);
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6804 tmp = NULL;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6805 } else {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6806 PyErr_SetString(PyExc_TypeError, "required field \"defaults\" missing from arguments");
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6807 return 1;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6808 }
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6809 *out = arguments(args, vararg, kwonlyargs, kw_defaults, kwarg,
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6810 defaults, arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6811 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6812 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6813 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6814 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6815 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6816
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6817 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6818 obj2ast_arg(PyObject* obj, arg_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6819 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6820 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6821 identifier arg;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6822 expr_ty annotation;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6823
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6824 if (_PyObject_HasAttrId(obj, &PyId_arg)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6825 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6826 tmp = _PyObject_GetAttrId(obj, &PyId_arg);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6827 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6828 res = obj2ast_identifier(tmp, &arg, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6829 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6830 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6831 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6832 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6833 PyErr_SetString(PyExc_TypeError, "required field \"arg\" missing from arg");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6834 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6835 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6836 if (exists_not_none(obj, &PyId_annotation)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6837 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6838 tmp = _PyObject_GetAttrId(obj, &PyId_annotation);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6839 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6840 res = obj2ast_expr(tmp, &annotation, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6841 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6842 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6843 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6844 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6845 annotation = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6846 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6847 *out = arg(arg, annotation, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6848 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6849 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6850 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6851 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6852 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6853
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6854 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6855 obj2ast_keyword(PyObject* obj, keyword_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6856 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6857 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6858 identifier arg;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6859 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6860
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6861 if (_PyObject_HasAttrId(obj, &PyId_arg)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6862 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6863 tmp = _PyObject_GetAttrId(obj, &PyId_arg);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6864 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6865 res = obj2ast_identifier(tmp, &arg, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6866 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6867 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6868 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6869 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6870 PyErr_SetString(PyExc_TypeError, "required field \"arg\" missing from keyword");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6871 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6872 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6873 if (_PyObject_HasAttrId(obj, &PyId_value)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6874 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6875 tmp = _PyObject_GetAttrId(obj, &PyId_value);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6876 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6877 res = obj2ast_expr(tmp, &value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6878 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6879 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6880 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6881 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6882 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from keyword");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6883 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6884 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6885 *out = keyword(arg, value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6886 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6887 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6888 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6889 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6890 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6891
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6892 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6893 obj2ast_alias(PyObject* obj, alias_ty* out, PyArena* arena)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6894 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6895 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6896 identifier name;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6897 identifier asname;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6898
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6899 if (_PyObject_HasAttrId(obj, &PyId_name)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6900 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6901 tmp = _PyObject_GetAttrId(obj, &PyId_name);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6902 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6903 res = obj2ast_identifier(tmp, &name, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6904 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6905 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6906 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6907 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6908 PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from alias");
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6909 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6910 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6911 if (exists_not_none(obj, &PyId_asname)) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6912 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6913 tmp = _PyObject_GetAttrId(obj, &PyId_asname);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6914 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6915 res = obj2ast_identifier(tmp, &asname, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6916 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6917 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6918 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6919 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6920 asname = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6921 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6922 *out = alias(name, asname, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6923 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6924 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6925 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6926 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6927 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6928
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6929 int
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6930 obj2ast_withitem(PyObject* obj, withitem_ty* out, PyArena* arena)
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6931 {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6932 PyObject* tmp = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6933 expr_ty context_expr;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6934 expr_ty optional_vars;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6935
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6936 if (_PyObject_HasAttrId(obj, &PyId_context_expr)) {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6937 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6938 tmp = _PyObject_GetAttrId(obj, &PyId_context_expr);
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6939 if (tmp == NULL) goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6940 res = obj2ast_expr(tmp, &context_expr, arena);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6941 if (res != 0) goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6942 Py_XDECREF(tmp);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6943 tmp = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6944 } else {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6945 PyErr_SetString(PyExc_TypeError, "required field \"context_expr\" missing from withitem");
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6946 return 1;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6947 }
82747 c8ccc0519247 refactor to fix refleaks Benjamin Peterson <benjamin@python.org> parents: 82732 diff changeset	6948 if (exists_not_none(obj, &PyId_optional_vars)) {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6949 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6950 tmp = _PyObject_GetAttrId(obj, &PyId_optional_vars);
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6951 if (tmp == NULL) goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6952 res = obj2ast_expr(tmp, &optional_vars, arena);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6953 if (res != 0) goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6954 Py_XDECREF(tmp);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6955 tmp = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6956 } else {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6957 optional_vars = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6958 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6959 *out = withitem(context_expr, optional_vars, arena);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6960 return 0;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6961 failed:
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6962 Py_XDECREF(tmp);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6963 return 1;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6964 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6965
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6966
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6967 static struct PyModuleDef _astmodule = {
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6968 PyModuleDef_HEAD_INIT, "_ast"
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6969 };
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6970 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6971 PyInit__ast(void)
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6972 {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6973 PyObject m, d;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6974 if (!init_types()) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6975 m = PyModule_Create(&_astmodule);
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6976 if (!m) return NULL;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6977 d = PyModule_GetDict(m);
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6978 if (PyDict_SetItemString(d, "AST", (PyObject*)&AST_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6979 NULL;
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 82750 diff changeset	6980 if (PyModule_AddIntMacro(m, PyCF_ONLY_AST) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6981 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6982 if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6983 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	6984 if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6985 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	6986 if (PyDict_SetItemString(d, "Interactive", (PyObject*)Interactive_type)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6987 < 0) return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	6988 if (PyDict_SetItemString(d, "Expression", (PyObject*)Expression_type) <
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6989 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6990 if (PyDict_SetItemString(d, "Suite", (PyObject*)Suite_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6991 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6992 if (PyDict_SetItemString(d, "stmt", (PyObject*)stmt_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6993 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	6994 if (PyDict_SetItemString(d, "FunctionDef", (PyObject*)FunctionDef_type)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6995 < 0) return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	6996 if (PyDict_SetItemString(d, "ClassDef", (PyObject*)ClassDef_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6997 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	6998 if (PyDict_SetItemString(d, "Return", (PyObject*)Return_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6999 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7000 if (PyDict_SetItemString(d, "Delete", (PyObject*)Delete_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7001 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7002 if (PyDict_SetItemString(d, "Assign", (PyObject*)Assign_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7003 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7004 if (PyDict_SetItemString(d, "AugAssign", (PyObject*)AugAssign_type) <
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7005 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7006 if (PyDict_SetItemString(d, "For", (PyObject*)For_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7007 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7008 if (PyDict_SetItemString(d, "While", (PyObject*)While_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7009 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7010 if (PyDict_SetItemString(d, "If", (PyObject*)If_type) < 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7011 if (PyDict_SetItemString(d, "With", (PyObject*)With_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7012 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7013 if (PyDict_SetItemString(d, "Raise", (PyObject*)Raise_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7014 NULL;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	7015 if (PyDict_SetItemString(d, "Try", (PyObject*)Try_type) < 0) return
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	7016 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7017 if (PyDict_SetItemString(d, "Assert", (PyObject*)Assert_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7018 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7019 if (PyDict_SetItemString(d, "Import", (PyObject*)Import_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7020 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7021 if (PyDict_SetItemString(d, "ImportFrom", (PyObject*)ImportFrom_type) <
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7022 0) return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7023 if (PyDict_SetItemString(d, "Global", (PyObject*)Global_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7024 return NULL;
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	7025 if (PyDict_SetItemString(d, "Nonlocal", (PyObject*)Nonlocal_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7026 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7027 if (PyDict_SetItemString(d, "Expr", (PyObject*)Expr_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7028 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7029 if (PyDict_SetItemString(d, "Pass", (PyObject*)Pass_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7030 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7031 if (PyDict_SetItemString(d, "Break", (PyObject*)Break_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7032 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7033 if (PyDict_SetItemString(d, "Continue", (PyObject*)Continue_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7034 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7035 if (PyDict_SetItemString(d, "expr", (PyObject*)expr_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7036 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7037 if (PyDict_SetItemString(d, "BoolOp", (PyObject*)BoolOp_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7038 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7039 if (PyDict_SetItemString(d, "BinOp", (PyObject*)BinOp_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7040 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7041 if (PyDict_SetItemString(d, "UnaryOp", (PyObject*)UnaryOp_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7042 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7043 if (PyDict_SetItemString(d, "Lambda", (PyObject*)Lambda_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7044 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7045 if (PyDict_SetItemString(d, "IfExp", (PyObject*)IfExp_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7046 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7047 if (PyDict_SetItemString(d, "Dict", (PyObject*)Dict_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7048 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7049 if (PyDict_SetItemString(d, "Set", (PyObject*)Set_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7050 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7051 if (PyDict_SetItemString(d, "ListComp", (PyObject*)ListComp_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7052 return NULL;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	7053 if (PyDict_SetItemString(d, "SetComp", (PyObject*)SetComp_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7054 return NULL;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	7055 if (PyDict_SetItemString(d, "DictComp", (PyObject*)DictComp_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7056 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7057 if (PyDict_SetItemString(d, "GeneratorExp",
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7058 (PyObject*)GeneratorExp_type) < 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7059 if (PyDict_SetItemString(d, "Yield", (PyObject*)Yield_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7060 NULL;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	7061 if (PyDict_SetItemString(d, "YieldFrom", (PyObject*)YieldFrom_type) <
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	7062 0) return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7063 if (PyDict_SetItemString(d, "Compare", (PyObject*)Compare_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7064 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7065 if (PyDict_SetItemString(d, "Call", (PyObject*)Call_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7066 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7067 if (PyDict_SetItemString(d, "Num", (PyObject*)Num_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7068 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7069 if (PyDict_SetItemString(d, "Str", (PyObject*)Str_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7070 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7071 if (PyDict_SetItemString(d, "Bytes", (PyObject*)Bytes_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7072 NULL;
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	7073 if (PyDict_SetItemString(d, "NameConstant",
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	7074 (PyObject*)NameConstant_type) < 0) return NULL;
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	7075 if (PyDict_SetItemString(d, "Ellipsis", (PyObject*)Ellipsis_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7076 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7077 if (PyDict_SetItemString(d, "Attribute", (PyObject*)Attribute_type) <
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7078 0) return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7079 if (PyDict_SetItemString(d, "Subscript", (PyObject*)Subscript_type) <
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7080 0) return NULL;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	7081 if (PyDict_SetItemString(d, "Starred", (PyObject*)Starred_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7082 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7083 if (PyDict_SetItemString(d, "Name", (PyObject*)Name_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7084 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7085 if (PyDict_SetItemString(d, "List", (PyObject*)List_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7086 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7087 if (PyDict_SetItemString(d, "Tuple", (PyObject*)Tuple_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7088 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7089 if (PyDict_SetItemString(d, "expr_context",
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7090 (PyObject*)expr_context_type) < 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7091 if (PyDict_SetItemString(d, "Load", (PyObject*)Load_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7092 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7093 if (PyDict_SetItemString(d, "Store", (PyObject*)Store_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7094 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7095 if (PyDict_SetItemString(d, "Del", (PyObject*)Del_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7096 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7097 if (PyDict_SetItemString(d, "AugLoad", (PyObject*)AugLoad_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7098 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7099 if (PyDict_SetItemString(d, "AugStore", (PyObject*)AugStore_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7100 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7101 if (PyDict_SetItemString(d, "Param", (PyObject*)Param_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7102 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7103 if (PyDict_SetItemString(d, "slice", (PyObject*)slice_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7104 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7105 if (PyDict_SetItemString(d, "Slice", (PyObject*)Slice_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7106 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7107 if (PyDict_SetItemString(d, "ExtSlice", (PyObject*)ExtSlice_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7108 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7109 if (PyDict_SetItemString(d, "Index", (PyObject*)Index_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7110 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7111 if (PyDict_SetItemString(d, "boolop", (PyObject*)boolop_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7112 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7113 if (PyDict_SetItemString(d, "And", (PyObject*)And_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7114 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7115 if (PyDict_SetItemString(d, "Or", (PyObject*)Or_type) < 0) return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7116 if (PyDict_SetItemString(d, "operator", (PyObject*)operator_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7117 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7118 if (PyDict_SetItemString(d, "Add", (PyObject*)Add_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7119 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7120 if (PyDict_SetItemString(d, "Sub", (PyObject*)Sub_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7121 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7122 if (PyDict_SetItemString(d, "Mult", (PyObject*)Mult_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7123 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7124 if (PyDict_SetItemString(d, "Div", (PyObject*)Div_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7125 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7126 if (PyDict_SetItemString(d, "Mod", (PyObject*)Mod_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7127 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7128 if (PyDict_SetItemString(d, "Pow", (PyObject*)Pow_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7129 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7130 if (PyDict_SetItemString(d, "LShift", (PyObject*)LShift_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7131 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7132 if (PyDict_SetItemString(d, "RShift", (PyObject*)RShift_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7133 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7134 if (PyDict_SetItemString(d, "BitOr", (PyObject*)BitOr_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7135 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7136 if (PyDict_SetItemString(d, "BitXor", (PyObject*)BitXor_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7137 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7138 if (PyDict_SetItemString(d, "BitAnd", (PyObject*)BitAnd_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7139 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7140 if (PyDict_SetItemString(d, "FloorDiv", (PyObject*)FloorDiv_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7141 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7142 if (PyDict_SetItemString(d, "unaryop", (PyObject*)unaryop_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7143 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7144 if (PyDict_SetItemString(d, "Invert", (PyObject*)Invert_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7145 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7146 if (PyDict_SetItemString(d, "Not", (PyObject*)Not_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7147 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7148 if (PyDict_SetItemString(d, "UAdd", (PyObject*)UAdd_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7149 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7150 if (PyDict_SetItemString(d, "USub", (PyObject*)USub_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7151 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7152 if (PyDict_SetItemString(d, "cmpop", (PyObject*)cmpop_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7153 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7154 if (PyDict_SetItemString(d, "Eq", (PyObject*)Eq_type) < 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7155 if (PyDict_SetItemString(d, "NotEq", (PyObject*)NotEq_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7156 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7157 if (PyDict_SetItemString(d, "Lt", (PyObject*)Lt_type) < 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7158 if (PyDict_SetItemString(d, "LtE", (PyObject*)LtE_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7159 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7160 if (PyDict_SetItemString(d, "Gt", (PyObject*)Gt_type) < 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7161 if (PyDict_SetItemString(d, "GtE", (PyObject*)GtE_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7162 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7163 if (PyDict_SetItemString(d, "Is", (PyObject*)Is_type) < 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7164 if (PyDict_SetItemString(d, "IsNot", (PyObject*)IsNot_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7165 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7166 if (PyDict_SetItemString(d, "In", (PyObject*)In_type) < 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7167 if (PyDict_SetItemString(d, "NotIn", (PyObject*)NotIn_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7168 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7169 if (PyDict_SetItemString(d, "comprehension",
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7170 (PyObject*)comprehension_type) < 0) return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7171 if (PyDict_SetItemString(d, "excepthandler",
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7172 (PyObject*)excepthandler_type) < 0) return NULL;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	7173 if (PyDict_SetItemString(d, "ExceptHandler",
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7174 (PyObject*)ExceptHandler_type) < 0) return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7175 if (PyDict_SetItemString(d, "arguments", (PyObject*)arguments_type) <
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7176 0) return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7177 if (PyDict_SetItemString(d, "arg", (PyObject*)arg_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7178 NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36794 diff changeset	7179 if (PyDict_SetItemString(d, "keyword", (PyObject*)keyword_type) < 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7180 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7181 if (PyDict_SetItemString(d, "alias", (PyObject*)alias_type) < 0) return
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7182 NULL;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	7183 if (PyDict_SetItemString(d, "withitem", (PyObject*)withitem_type) < 0)
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	7184 return NULL;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7185 return m;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	7186 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	7187
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7188
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	7189 PyObject* PyAST_mod2obj(mod_ty t)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7190 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	7191 init_types();
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	7192 return ast2obj_mod(t);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7193 }
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41825 diff changeset	7194
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7195 /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */
b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7196 mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7197 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7198 mod_ty res;
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7199 PyObject req_type[] = {(PyObject)Module_type, (PyObject*)Expression_type,
b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7200 (PyObject*)Interactive_type};
b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7201 char *req_name[] = {"Module", "Expression", "Interactive"};
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7202 int isinstance;
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7203 assert(0 <= mode && mode <= 2);
b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7204
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7205 init_types();
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7206
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7207 isinstance = PyObject_IsInstance(ast, req_type[mode]);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7208 if (isinstance == -1)
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7209 return NULL;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7210 if (!isinstance) {
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7211 PyErr_Format(PyExc_TypeError, "expected %s node, got %.400s",
b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7212 req_name[mode], Py_TYPE(ast)->tp_name);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7213 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7214 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7215 if (obj2ast_mod(ast, &res, arena) != 0)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7216 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7217 else
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7218 return res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7219 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7220
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7221 int PyAST_Check(PyObject* obj)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7222 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7223 init_types();
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	7224 return PyObject_IsInstance(obj, (PyObject*)&AST_type);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7225 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7226
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7227

Mercurial > cpython-lru_cache-weakref

annotate Python/Python-ast.c @ 83867:12cbb5183d98