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

annotate Python/Python-ast.c @ 82732:7c5c678e4164

unify some ast.argument's attrs; change Attribute column offset (closes #16795) Patch from Sven Brauch.

author	Benjamin Peterson <benjamin@python.org>
date	Mon, 18 Mar 2013 10:48:58 -0700
parents	7d69d04522e3
children	c8ccc0519247

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
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	773
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	774 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	775 {
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	776 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	777 if (initialized) return 1;
49583 2a38771cecdd update Python-ast.c Benjamin Peterson <benjamin@python.org> parents: 49139 diff changeset	778 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	779 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	780 if (!mod_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	781 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	782 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	783 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	784 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	785 Interactive_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	786 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	787 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	788 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	789 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	790 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	791 if (!Suite_type) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	792 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	793 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	794 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	795 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	796 FunctionDef_fields, 5);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	797 if (!FunctionDef_type) return 0;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	798 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	799 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	800 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	801 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	802 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	803 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	804 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	805 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	806 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	807 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	808 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	809 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	810 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	811 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	812 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	813 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	814 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	815 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	816 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	817 if (!Raise_type) return 0;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	818 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	819 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	820 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	821 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	822 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	823 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	824 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	825 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	826 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	827 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	828 if (!Global_type) return 0;
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	829 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	830 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	831 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	832 if (!Expr_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	833 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	834 if (!Pass_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	835 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	836 if (!Break_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	837 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	838 if (!Continue_type) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	839 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	840 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	841 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	842 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	843 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	844 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	845 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	846 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	847 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	848 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	849 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	850 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	851 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	852 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	853 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	854 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	855 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	856 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	857 if (!ListComp_type) return 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	858 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	859 if (!SetComp_type) return 0;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	860 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	861 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	862 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	863 GeneratorExp_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	864 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	865 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	866 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	867 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	868 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	869 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	870 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	871 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	872 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	873 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	874 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	875 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	876 if (!Str_type) return 0;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	877 Bytes_type = make_type("Bytes", expr_type, Bytes_fields, 1);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	878 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	879 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	880 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	881 if (!NameConstant_type) return 0;
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	882 Ellipsis_type = make_type("Ellipsis", expr_type, NULL, 0);
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	883 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	884 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	885 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	886 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	887 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	888 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	889 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	890 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	891 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	892 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	893 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	894 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	895 if (!Tuple_type) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	896 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	897 if (!expr_context_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	898 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	899 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	900 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	901 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	902 if (!Load_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	903 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	904 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	905 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	906 if (!Store_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	907 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	908 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	909 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	910 if (!Del_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	911 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	912 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	913 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	914 if (!AugLoad_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	915 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	916 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	917 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	918 if (!AugStore_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	919 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	920 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	921 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	922 if (!Param_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	923 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	924 if (!slice_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	925 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	926 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	927 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	928 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	929 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	930 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	931 if (!Index_type) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	932 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	933 if (!boolop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	934 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	935 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	936 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	937 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	938 if (!And_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	939 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	940 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	941 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	942 if (!Or_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	943 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	944 if (!operator_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	945 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	946 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	947 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	948 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	949 if (!Add_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	950 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	951 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	952 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	953 if (!Sub_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	954 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	955 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	956 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	957 if (!Mult_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	958 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	959 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	960 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	961 if (!Div_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	962 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	963 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	964 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	965 if (!Mod_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	966 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	967 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	968 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	969 if (!Pow_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	970 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	971 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	972 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	973 if (!LShift_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	974 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	975 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	976 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	977 if (!RShift_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	978 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	979 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	980 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	981 if (!BitOr_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	982 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	983 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	984 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	985 if (!BitXor_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	986 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	987 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	988 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	989 if (!BitAnd_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	990 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	991 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	992 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	993 if (!FloorDiv_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	994 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	995 if (!unaryop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	996 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	997 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	998 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	999 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	1000 if (!Invert_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1001 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	1002 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	1003 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	1004 if (!Not_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1005 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	1006 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	1007 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	1008 if (!UAdd_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1009 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	1010 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	1011 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	1012 if (!USub_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	1013 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	1014 if (!cmpop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1015 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	1016 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	1017 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	1018 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	1019 if (!Eq_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1020 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	1021 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	1022 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	1023 if (!NotEq_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1024 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	1025 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	1026 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	1027 if (!Lt_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1028 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	1029 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	1030 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	1031 if (!LtE_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1032 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	1033 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	1034 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	1035 if (!Gt_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1036 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	1037 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	1038 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	1039 if (!GtE_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1040 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	1041 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	1042 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	1043 if (!Is_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1044 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	1045 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	1046 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	1047 if (!IsNot_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1048 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	1049 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	1050 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	1051 if (!In_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	1052 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	1053 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	1054 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	1055 if (!NotIn_singleton) return 0;
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	1056 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	1057 comprehension_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1058 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	1059 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	1060 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	1061 if (!excepthandler_type) return 0;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1062 if (!add_attributes(excepthandler_type, excepthandler_attributes, 2))
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1063 return 0;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1064 ExceptHandler_type = make_type("ExceptHandler", excepthandler_type,
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1065 ExceptHandler_fields, 3);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	1066 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	1067 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	1068 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	1069 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	1070 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	1071 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	1072 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	1073 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	1074 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	1075 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	1076 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	1077 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	1078 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	1079 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	1080 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	1081 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	1082 initialized = 1;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	1083 return 1;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	1084 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	1085
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1086 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	1087 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	1088 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	1089 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	1090 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1091 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	1092 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	1093 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	1094 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	1095 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	1096 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	1097 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1098 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	1099 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	1100 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	1101 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	1102 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	1103 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	1104 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	1105
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1106 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	1107 Module(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1108 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1109 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	1110 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	1111 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1112 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1113 p->kind = Module_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1114 p->v.Module.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1115 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1116 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1117
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1118 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	1119 Interactive(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1120 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1121 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	1122 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	1123 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1124 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1125 p->kind = Interactive_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1126 p->v.Interactive.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1127 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1128 }
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 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	1131 Expression(expr_ty body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1132 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1133 mod_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1134 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1135 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1136 "field body is required for Expression");
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 }
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	1139 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	1140 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1141 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142 p->kind = Expression_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143 p->v.Expression.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1144 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1147 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	1148 Suite(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1149 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1150 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	1151 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	1152 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1153 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1154 p->kind = Suite_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1155 p->v.Suite.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1156 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1157 }
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 stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1160 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	1161 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	1162 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1163 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1164 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1165 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1166 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1167 "field name is required for FunctionDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1168 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1169 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1170 if (!args) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1171 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1172 "field args is required for FunctionDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1173 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1174 }
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	1175 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	1176 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1177 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1178 p->kind = FunctionDef_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1179 p->v.FunctionDef.name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1180 p->v.FunctionDef.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1181 p->v.FunctionDef.body = body;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	1182 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	1183 p->v.FunctionDef.returns = returns;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1184 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1185 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1186 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1187 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1188
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1189 stmt_ty
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	1190 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	1191 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	1192 int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1193 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1194 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1195 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1196 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1197 "field name is required for ClassDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1198 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1199 }
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	1200 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	1201 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1202 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1203 p->kind = ClassDef_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1204 p->v.ClassDef.name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1205 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	1206 p->v.ClassDef.keywords = keywords;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	1207 p->v.ClassDef.starargs = starargs;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	1208 p->v.ClassDef.kwargs = kwargs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1209 p->v.ClassDef.body = body;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	1210 p->v.ClassDef.decorator_list = decorator_list;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1211 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	1212 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1213 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1214 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1215
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1216 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	1217 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	1218 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1219 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	1220 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	1221 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1222 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1223 p->kind = Return_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1224 p->v.Return.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1225 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	1226 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1227 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1230 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	1231 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	1232 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1233 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	1234 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	1235 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1236 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1237 p->kind = Delete_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1238 p->v.Delete.targets = targets;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1239 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1240 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1241 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1244 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1245 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	1246 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1247 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1248 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1249 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1250 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1251 "field value is required for Assign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1252 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1253 }
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	1254 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	1255 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1256 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1257 p->kind = Assign_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1258 p->v.Assign.targets = targets;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1259 p->v.Assign.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1260 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	1261 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1262 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1263 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1264
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1265 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1266 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	1267 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1268 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1269 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1270 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1271 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1272 "field target is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1273 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1274 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1275 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1276 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1277 "field op is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1278 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1279 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1280 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1281 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1282 "field value is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1283 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1284 }
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	1285 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	1286 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1287 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1288 p->kind = AugAssign_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1289 p->v.AugAssign.target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1290 p->v.AugAssign.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1291 p->v.AugAssign.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1292 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	1293 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1294 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1295 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1296
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1297 stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1298 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	1299 lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1300 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1301 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1302 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1303 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1304 "field target is required for For");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1305 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1306 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1307 if (!iter) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1308 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1309 "field iter is required for For");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1310 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1311 }
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	1312 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	1313 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1314 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1315 p->kind = For_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1316 p->v.For.target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1317 p->v.For.iter = iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1318 p->v.For.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1319 p->v.For.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1320 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	1321 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1322 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1323 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1324
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1325 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	1326 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	1327 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1328 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1329 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1330 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1331 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1332 "field test is required for While");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1333 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1334 }
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	1335 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	1336 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1337 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1338 p->kind = While_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1339 p->v.While.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1340 p->v.While.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1341 p->v.While.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1342 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	1343 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1344 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1345 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1346
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1347 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	1348 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	1349 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1350 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1351 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1352 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1353 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1354 "field test is required for If");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1355 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1356 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1357 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1358 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1359 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1360 p->kind = If_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1361 p->v.If.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1362 p->v.If.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1363 p->v.If.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1364 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	1365 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1366 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1367 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1368
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1369 stmt_ty
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	1370 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	1371 *arena)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1372 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1373 stmt_ty p;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1374 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	1375 if (!p)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1376 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1377 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	1378 p->v.With.items = items;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1379 p->v.With.body = body;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1380 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	1381 p->col_offset = col_offset;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1382 return p;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1383 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1384
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1385 stmt_ty
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	1386 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	1387 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1388 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	1389 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	1390 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1391 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1392 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	1393 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	1394 p->v.Raise.cause = cause;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1395 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	1396 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1397 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1398 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1399
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1400 stmt_ty
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1401 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	1402 finalbody, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1403 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1404 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	1405 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	1406 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1407 return NULL;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1408 p->kind = Try_kind;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1409 p->v.Try.body = body;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1410 p->v.Try.handlers = handlers;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1411 p->v.Try.orelse = orelse;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	1412 p->v.Try.finalbody = finalbody;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1413 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1414 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1415 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1416 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1417
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1418 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1419 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	1420 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1421 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1422 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1423 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1424 "field test is required for Assert");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1425 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1426 }
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	1427 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	1428 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1429 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1430 p->kind = Assert_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1431 p->v.Assert.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1432 p->v.Assert.msg = msg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1433 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	1434 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1435 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1436 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1437
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1438 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	1439 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	1440 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1441 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	1442 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	1443 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1444 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1445 p->kind = Import_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1446 p->v.Import.names = names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1447 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1448 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1449 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1450 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1451
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1452 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1453 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	1454 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1455 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1456 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	1457 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	1458 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1459 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1460 p->kind = ImportFrom_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1461 p->v.ImportFrom.module = module;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1462 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	1463 p->v.ImportFrom.level = level;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1464 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	1465 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1466 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1467 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1468
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1469 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	1470 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	1471 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1472 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	1473 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	1474 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1475 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1476 p->kind = Global_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1477 p->v.Global.names = names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1478 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	1479 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1480 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1483 stmt_ty
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1484 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	1485 {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1486 stmt_ty p;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1487 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1488 if (!p)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1489 return NULL;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1490 p->kind = Nonlocal_kind;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1491 p->v.Nonlocal.names = names;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1492 p->lineno = lineno;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1493 p->col_offset = col_offset;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1494 return p;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1495 }
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1496
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	1497 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	1498 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	1499 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1500 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1501 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1502 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1503 "field value is required for Expr");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1504 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1505 }
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	1506 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	1507 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1508 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1509 p->kind = Expr_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1510 p->v.Expr.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1511 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	1512 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1513 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1514 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1515
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1516 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	1517 Pass(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1518 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1519 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	1520 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	1521 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1522 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1523 p->kind = Pass_kind;
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 Break(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 = Break_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 Continue(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 = Continue_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 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	1556 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	1557 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1558 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1559 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1560 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1561 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1562 "field op is required for BoolOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1563 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1564 }
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	1565 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	1566 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1567 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1568 p->kind = BoolOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1569 p->v.BoolOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1570 p->v.BoolOp.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1571 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	1572 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1573 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1574 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1575
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1576 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	1577 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	1578 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1579 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1580 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1581 if (!left) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1582 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1583 "field left is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1584 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1585 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1586 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1587 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1588 "field op is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1589 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1590 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1591 if (!right) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1592 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1593 "field right is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1594 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1595 }
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	1596 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	1597 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1598 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1599 p->kind = BinOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1600 p->v.BinOp.left = left;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1601 p->v.BinOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1602 p->v.BinOp.right = right;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1603 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	1604 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1605 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1606 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1607
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1608 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	1609 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	1610 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1611 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1612 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1613 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1614 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1615 "field op is required for UnaryOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1616 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1617 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1618 if (!operand) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1619 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1620 "field operand is required for UnaryOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1621 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1622 }
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	1623 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	1624 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1625 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1626 p->kind = UnaryOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1627 p->v.UnaryOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1628 p->v.UnaryOp.operand = operand;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1629 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	1630 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1631 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1632 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1633
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1634 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	1635 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	1636 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1637 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1638 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1639 if (!args) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1640 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1641 "field args is required for Lambda");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1642 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1643 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1644 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1645 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1646 "field body is required for Lambda");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1647 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1648 }
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	1649 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	1650 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1651 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1652 p->kind = Lambda_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1653 p->v.Lambda.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1654 p->v.Lambda.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1655 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	1656 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1657 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1658 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1659
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1660 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	1661 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	1662 PyArena *arena)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1663 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1664 expr_ty p;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1665 if (!test) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1666 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1667 "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	1668 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1669 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1670 if (!body) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1671 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1672 "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	1673 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1674 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1675 if (!orelse) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1676 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1677 "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	1678 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1679 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1680 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	1681 if (!p)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1682 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1683 p->kind = IfExp_kind;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1684 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	1685 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	1686 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	1687 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	1688 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	1689 return p;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1690 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1691
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1692 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	1693 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	1694 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1695 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1696 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	1697 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	1698 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1699 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1700 p->kind = Dict_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1701 p->v.Dict.keys = keys;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1702 p->v.Dict.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1703 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	1704 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1705 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1706 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1707
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1708 expr_ty
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1709 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	1710 {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1711 expr_ty p;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1712 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	1713 if (!p)
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1714 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1715 p->kind = Set_kind;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1716 p->v.Set.elts = elts;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1717 p->lineno = lineno;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1718 p->col_offset = col_offset;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1719 return p;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1720 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1721
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	1722 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	1723 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	1724 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1725 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1726 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1727 if (!elt) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1728 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1729 "field elt is required for ListComp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1730 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1731 }
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	1732 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	1733 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1734 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1735 p->kind = ListComp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1736 p->v.ListComp.elt = elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1737 p->v.ListComp.generators = generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1738 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	1739 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1740 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1741 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1742
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1743 expr_ty
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1744 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	1745 *arena)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1746 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1747 expr_ty p;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1748 if (!elt) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1749 PyErr_SetString(PyExc_ValueError,
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1750 "field elt is required for SetComp");
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1751 return NULL;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1752 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1753 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	1754 if (!p)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1755 return NULL;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1756 p->kind = SetComp_kind;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1757 p->v.SetComp.elt = elt;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1758 p->v.SetComp.generators = generators;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1759 p->lineno = lineno;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1760 p->col_offset = col_offset;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1761 return p;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1762 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1763
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	1764 expr_ty
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1765 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	1766 col_offset, PyArena *arena)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1767 {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1768 expr_ty p;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1769 if (!key) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1770 PyErr_SetString(PyExc_ValueError,
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1771 "field key is required for DictComp");
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1772 return NULL;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1773 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1774 if (!value) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1775 PyErr_SetString(PyExc_ValueError,
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1776 "field value is required for DictComp");
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1777 return NULL;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1778 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1779 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	1780 if (!p)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1781 return NULL;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1782 p->kind = DictComp_kind;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1783 p->v.DictComp.key = key;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1784 p->v.DictComp.value = value;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1785 p->v.DictComp.generators = generators;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1786 p->lineno = lineno;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1787 p->col_offset = col_offset;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1788 return p;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1789 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1790
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1791 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	1792 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	1793 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1794 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1795 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1796 if (!elt) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1797 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1798 "field elt is required for GeneratorExp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1799 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1800 }
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	1801 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	1802 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1803 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1804 p->kind = GeneratorExp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1805 p->v.GeneratorExp.elt = elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1806 p->v.GeneratorExp.generators = generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1807 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	1808 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1809 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1810 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1811
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1812 expr_ty
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1813 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	1814 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1815 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	1816 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	1817 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1818 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1819 p->kind = Yield_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1820 p->v.Yield.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1821 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	1822 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1823 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1826 expr_ty
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1827 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	1828 {
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1829 expr_ty p;
80589 ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1830 if (!value) {
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1831 PyErr_SetString(PyExc_ValueError,
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1832 "field value is required for YieldFrom");
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1833 return NULL;
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	1834 }
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1835 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	1836 if (!p)
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1837 return NULL;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1838 p->kind = YieldFrom_kind;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1839 p->v.YieldFrom.value = value;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1840 p->lineno = lineno;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1841 p->col_offset = col_offset;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1842 return p;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1843 }
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1844
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	1845 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	1846 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	1847 int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1848 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1849 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1850 if (!left) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1851 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1852 "field left is required for Compare");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1853 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1854 }
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	1855 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	1856 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1857 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1858 p->kind = Compare_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1859 p->v.Compare.left = left;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1860 p->v.Compare.ops = ops;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1861 p->v.Compare.comparators = comparators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1862 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1863 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1864 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1865 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1866
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1867 expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1868 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	1869 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	1870 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1871 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1872 if (!func) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1873 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1874 "field func is required for Call");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1875 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1876 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1877 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40937 6aa1be5dd009 Merged revisions 53912-53951 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40896 diff changeset	1878 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1879 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1880 p->kind = Call_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1881 p->v.Call.func = func;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1882 p->v.Call.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1883 p->v.Call.keywords = keywords;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1884 p->v.Call.starargs = starargs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1885 p->v.Call.kwargs = kwargs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1886 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	1887 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1888 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1889 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1890
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1891 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	1892 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	1893 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1894 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1895 if (!n) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1896 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1897 "field n is required for Num");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1898 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1899 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1900 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	1901 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1902 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1903 p->kind = Num_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1904 p->v.Num.n = n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1905 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	1906 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1907 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1908 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1909
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1910 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	1911 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	1912 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1913 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1914 if (!s) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1915 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1916 "field s is required for Str");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1917 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1918 }
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	1919 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	1920 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1921 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1922 p->kind = Str_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1923 p->v.Str.s = s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1924 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	1925 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1926 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1927 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1928
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1929 expr_ty
71792 f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	1930 Bytes(bytes s, int lineno, int col_offset, PyArena *arena)
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1931 {
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1932 expr_ty p;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1933 if (!s) {
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1934 PyErr_SetString(PyExc_ValueError,
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1935 "field s is required for Bytes");
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1936 return NULL;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1937 }
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1938 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	1939 if (!p)
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1940 return NULL;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1941 p->kind = Bytes_kind;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1942 p->v.Bytes.s = s;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1943 p->lineno = lineno;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1944 p->col_offset = col_offset;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1945 return p;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1946 }
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1947
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	1948 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	1949 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	1950 {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1951 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	1952 if (!value) {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1953 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	1954 "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	1955 return NULL;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1956 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1957 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	1958 if (!p)
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1959 return NULL;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1960 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	1961 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	1962 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	1963 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	1964 return p;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1965 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1966
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1967 expr_ty
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1968 Ellipsis(int lineno, int col_offset, PyArena *arena)
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1969 {
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1970 expr_ty p;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1971 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	1972 if (!p)
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1973 return NULL;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1974 p->kind = Ellipsis_kind;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1975 p->lineno = lineno;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1976 p->col_offset = col_offset;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1977 return p;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1978 }
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1979
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1980 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	1981 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	1982 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1983 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1984 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1985 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1986 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1987 "field value is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1988 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1989 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1990 if (!attr) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1991 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1992 "field attr is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1993 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1994 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1995 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1996 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1997 "field ctx is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1998 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1999 }
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	2000 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	2001 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2002 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2003 p->kind = Attribute_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2004 p->v.Attribute.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2005 p->v.Attribute.attr = attr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2006 p->v.Attribute.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2007 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	2008 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2009 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2010 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2011
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2012 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	2013 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	2014 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2015 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2016 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2017 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2018 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2019 "field value is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2020 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2021 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2022 if (!slice) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2023 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2024 "field slice is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2025 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2026 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2027 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2028 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2029 "field ctx is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2030 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2031 }
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	2032 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	2033 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2034 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2035 p->kind = Subscript_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2036 p->v.Subscript.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2037 p->v.Subscript.slice = slice;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2038 p->v.Subscript.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2039 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	2040 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2041 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2042 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2043
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2044 expr_ty
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2045 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	2046 *arena)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2047 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2048 expr_ty p;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2049 if (!value) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2050 PyErr_SetString(PyExc_ValueError,
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2051 "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	2052 return NULL;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2053 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2054 if (!ctx) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2055 PyErr_SetString(PyExc_ValueError,
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2056 "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	2057 return NULL;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2058 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2059 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	2060 if (!p)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2061 return NULL;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2062 p->kind = Starred_kind;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2063 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	2064 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	2065 p->lineno = lineno;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2066 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	2067 return p;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2068 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2069
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	2070 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	2071 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	2072 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2073 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2074 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2075 if (!id) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2076 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2077 "field id is required for Name");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2078 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2079 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2080 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2081 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2082 "field ctx is required for Name");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2083 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2084 }
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	2085 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	2086 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2087 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2088 p->kind = Name_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2089 p->v.Name.id = id;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2090 p->v.Name.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2091 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	2092 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2093 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2094 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2095
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2096 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	2097 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	2098 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2099 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2100 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2101 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2102 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2103 "field ctx is required for List");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2104 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2105 }
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	2106 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	2107 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2108 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2109 p->kind = List_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2110 p->v.List.elts = elts;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2111 p->v.List.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2112 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	2113 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2114 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2115 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2116
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2117 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	2118 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	2119 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2120 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2121 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2122 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2123 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2124 "field ctx is required for Tuple");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2125 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2126 }
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	2127 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	2128 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2129 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2130 p->kind = Tuple_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2131 p->v.Tuple.elts = elts;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2132 p->v.Tuple.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2133 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	2134 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2135 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2136 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2137
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2138 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	2139 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	2140 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2141 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	2142 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	2143 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2144 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2145 p->kind = Slice_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2146 p->v.Slice.lower = lower;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2147 p->v.Slice.upper = upper;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2148 p->v.Slice.step = step;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2149 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2152 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	2153 ExtSlice(asdl_seq * dims, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2154 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2155 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	2156 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	2157 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2158 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2159 p->kind = ExtSlice_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2160 p->v.ExtSlice.dims = dims;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2161 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2162 }
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 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	2165 Index(expr_ty value, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2166 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2167 slice_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2168 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2169 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2170 "field value is required for Index");
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 }
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	2173 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	2174 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2175 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2176 p->kind = Index_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2177 p->v.Index.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2178 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2181 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	2182 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	2183 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2184 comprehension_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2185 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2186 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2187 "field target is required for comprehension");
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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2190 if (!iter) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2191 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2192 "field iter is required for comprehension");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2193 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2194 }
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 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	2196 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2197 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2198 p->target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2199 p->iter = iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2200 p->ifs = ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2201 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2204 excepthandler_ty
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2205 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	2206 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2207 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2208 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	2209 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	2210 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2211 return NULL;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2212 p->kind = ExceptHandler_kind;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2213 p->v.ExceptHandler.type = type;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2214 p->v.ExceptHandler.name = name;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	2215 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	2216 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	2217 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2218 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2219 }
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 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	2222 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	2223 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	2224 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2225 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	2226 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	2227 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2228 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2229 p->args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2230 p->vararg = vararg;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	2231 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	2232 p->kw_defaults = kw_defaults;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2233 p->kwarg = kwarg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2234 p->defaults = defaults;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2235 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2236 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2237
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2238 arg_ty
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	2239 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	2240 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2241 arg_ty p;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2242 if (!arg) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2243 PyErr_SetString(PyExc_ValueError,
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	2244 "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	2245 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2246 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2247 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	2248 if (!p)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2249 return NULL;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	2250 p->arg = arg;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	2251 p->annotation = annotation;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2252 return p;
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
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2255 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	2256 keyword(identifier arg, expr_ty value, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2257 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2258 keyword_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2259 if (!arg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2260 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2261 "field arg is required for keyword");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2262 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2263 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2264 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2265 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2266 "field value is required for keyword");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2267 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2268 }
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 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	2270 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2271 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2272 p->arg = arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2273 p->value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2274 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2275 }
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 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	2278 alias(identifier name, identifier asname, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2279 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2280 alias_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2281 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2282 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2283 "field name is required for alias");
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 }
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	2286 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	2287 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2288 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2289 p->name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2290 p->asname = asname;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2291 return p;
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
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2294 withitem_ty
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2295 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	2296 {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2297 withitem_ty p;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2298 if (!context_expr) {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2299 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	2300 "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	2301 return NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2302 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2303 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	2304 if (!p)
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2305 return NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	2306 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	2307 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	2308 return p;
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
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2311
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2312 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2313 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	2314 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2315 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	2316 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	2317 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2318 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	2319 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2320 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2321
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2322 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2323 case Module_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2324 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	2325 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	2326 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	2327 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2328 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	2329 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2330 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2331 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2332 case Interactive_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2333 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	2334 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	2335 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	2336 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2337 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	2338 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2339 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2340 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2341 case Expression_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2342 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	2343 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	2344 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	2345 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2346 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	2347 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2348 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2349 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2350 case Suite_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2351 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	2352 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	2353 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	2354 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2355 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	2356 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2357 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2358 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2359 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2360 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2361 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2362 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2363 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2364 return NULL;
36174 85b2d804ac0a Regenerate. Martin v. Löwis <martin@v.loewis.de> parents: 36065 diff changeset	2365 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2366
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2367 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2368 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	2369 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2370 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	2371 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	2372 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2373 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	2374 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2375 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2376
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2377 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2378 case FunctionDef_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2379 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	2380 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	2381 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	2382 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2383 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	2384 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2385 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2386 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	2387 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2388 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	2389 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2390 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2391 value = ast2obj_list(o->v.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	2392 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2393 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	2394 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2395 Py_DECREF(value);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2396 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	2397 ast2obj_expr);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2398 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2399 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	2400 -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2401 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2402 Py_DECREF(value);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2403 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	2404 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2405 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	2406 goto failed;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	2407 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	2408 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2409 case ClassDef_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2410 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	2411 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	2412 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	2413 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2414 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	2415 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2416 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2417 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	2418 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2419 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	2420 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2421 Py_DECREF(value);
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2422 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	2423 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2424 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	2425 goto failed;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2426 Py_DECREF(value);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2427 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	2428 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2429 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	2430 goto failed;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2431 Py_DECREF(value);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2432 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	2433 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2434 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	2435 goto failed;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40980 diff changeset	2436 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	2437 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	2438 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2439 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	2440 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2441 Py_DECREF(value);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2442 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	2443 ast2obj_expr);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2444 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2445 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	2446 -1)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2447 goto failed;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41722 diff changeset	2448 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	2449 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2450 case Return_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2451 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	2452 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	2453 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	2454 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2455 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	2456 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2457 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2458 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2459 case Delete_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2460 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	2461 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	2462 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	2463 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2464 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	2465 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2466 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2467 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2468 case Assign_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2469 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	2470 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	2471 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	2472 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2473 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	2474 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2475 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2476 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	2477 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2478 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	2479 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2480 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2481 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2482 case AugAssign_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2483 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	2484 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	2485 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	2486 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2487 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	2488 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2489 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2490 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	2491 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2492 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	2493 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2494 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2495 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	2496 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2497 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	2498 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2499 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2500 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2501 case For_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2502 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	2503 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	2504 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	2505 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2506 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	2507 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2508 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2509 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	2510 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2511 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	2512 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2513 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2514 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	2515 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2516 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	2517 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2518 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2519 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	2520 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2521 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	2522 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2523 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2524 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2525 case While_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2526 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	2527 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	2528 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	2529 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2530 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	2531 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2532 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2533 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	2534 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2535 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	2536 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2537 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2538 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	2539 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2540 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	2541 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2542 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2543 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2544 case If_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2545 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	2546 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	2547 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	2548 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2549 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	2550 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2551 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2552 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	2553 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2554 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	2555 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2556 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2557 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	2558 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2559 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	2560 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2561 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2562 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2563 case With_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2564 result = PyType_GenericNew(With_type, NULL, NULL);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2565 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	2566 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	2567 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2568 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	2569 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2570 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2571 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	2572 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2573 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	2574 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2575 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2576 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2577 case Raise_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2578 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	2579 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	2580 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	2581 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2582 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	2583 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2584 Py_DECREF(value);
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42844 diff changeset	2585 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	2586 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2587 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	2588 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2589 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2590 break;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2591 case Try_kind:
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2592 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	2593 if (!result) goto failed;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2594 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	2595 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2596 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	2597 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2598 Py_DECREF(value);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2599 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	2600 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2601 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	2602 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2603 Py_DECREF(value);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2604 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	2605 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2606 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	2607 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2608 Py_DECREF(value);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	2609 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	2610 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2611 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	2612 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2613 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2614 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2615 case Assert_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2616 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	2617 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	2618 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	2619 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2620 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	2621 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2622 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2623 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	2624 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2625 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	2626 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2627 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2628 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2629 case Import_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2630 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	2631 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	2632 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	2633 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2634 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	2635 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2636 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2637 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2638 case ImportFrom_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2639 result = PyType_GenericNew(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	2640 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2641 value = ast2obj_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	2642 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2643 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	2644 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2645 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2646 value = ast2obj_list(o->v.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	2647 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2648 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	2649 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2650 Py_DECREF(value);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2651 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	2652 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2653 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	2654 goto failed;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2655 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	2656 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2657 case Global_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2658 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	2659 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	2660 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	2661 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2662 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	2663 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2664 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2665 break;
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2666 case Nonlocal_kind:
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2667 result = PyType_GenericNew(Nonlocal_type, NULL, NULL);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2668 if (!result) goto failed;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2669 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	2670 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2671 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	2672 goto failed;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2673 Py_DECREF(value);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	2674 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2675 case Expr_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2676 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	2677 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	2678 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	2679 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2680 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	2681 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2682 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2683 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2684 case Pass_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2685 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	2686 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	2687 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2688 case Break_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(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	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 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2692 case Continue_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2693 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	2694 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	2695 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2696 }
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2697 value = ast2obj_int(o->lineno);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2698 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2699 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	2700 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2701 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	2702 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	2703 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2704 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	2705 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2706 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	2707 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2708 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2709 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2710 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2711 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2712 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2713
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2714 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2715 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	2716 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2717 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	2718 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	2719 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2720 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	2721 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2722 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2723
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2724 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2725 case BoolOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2726 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	2727 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	2728 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	2729 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2730 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	2731 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2732 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2733 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	2734 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2735 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	2736 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2737 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2738 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2739 case BinOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2740 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	2741 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	2742 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	2743 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2744 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	2745 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2746 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2747 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	2748 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2749 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	2750 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2751 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2752 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	2753 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2754 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	2755 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2756 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2757 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2758 case UnaryOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2759 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	2760 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	2761 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	2762 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2763 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	2764 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2765 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2766 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	2767 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2768 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	2769 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2770 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2771 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2772 case Lambda_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2773 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	2774 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	2775 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	2776 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2777 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	2778 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2779 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2780 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	2781 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2782 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	2783 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2784 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2785 break;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2786 case IfExp_kind:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2787 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	2788 if (!result) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2789 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	2790 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2791 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	2792 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2793 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2794 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	2795 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2796 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	2797 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2798 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2799 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	2800 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2801 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	2802 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2803 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2804 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2805 case Dict_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2806 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	2807 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	2808 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	2809 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2810 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	2811 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2812 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2813 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	2814 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2815 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	2816 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2817 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2818 break;
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2819 case Set_kind:
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2820 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	2821 if (!result) goto failed;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2822 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	2823 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2824 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	2825 goto failed;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2826 Py_DECREF(value);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39691 diff changeset	2827 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2828 case ListComp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2829 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	2830 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	2831 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	2832 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2833 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	2834 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2835 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2836 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	2837 ast2obj_comprehension);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2838 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2839 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	2840 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2841 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2842 break;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2843 case SetComp_kind:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2844 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	2845 if (!result) goto failed;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2846 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	2847 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2848 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	2849 goto failed;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2850 Py_DECREF(value);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2851 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	2852 ast2obj_comprehension);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2853 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2854 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	2855 goto failed;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2856 Py_DECREF(value);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	2857 break;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2858 case DictComp_kind:
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2859 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	2860 if (!result) goto failed;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2861 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	2862 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2863 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	2864 goto failed;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2865 Py_DECREF(value);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2866 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	2867 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2868 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	2869 goto failed;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2870 Py_DECREF(value);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2871 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	2872 ast2obj_comprehension);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2873 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2874 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	2875 goto failed;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2876 Py_DECREF(value);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	2877 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2878 case GeneratorExp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2879 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	2880 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	2881 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	2882 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2883 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	2884 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2885 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2886 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	2887 ast2obj_comprehension);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2888 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2889 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	2890 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2891 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2892 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2893 case Yield_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2894 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	2895 if (!result) goto failed;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2896 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	2897 if (!value) goto failed;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2898 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	2899 goto failed;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73701 diff changeset	2900 Py_DECREF(value);
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2901 break;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2902 case YieldFrom_kind:
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2903 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	2904 if (!result) goto failed;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	2905 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	2906 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2907 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	2908 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2909 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2910 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2911 case Compare_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2912 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	2913 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	2914 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	2915 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2916 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	2917 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2918 Py_DECREF(value);
36661 710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2919 {
76964 c18a1a82bb07 use Py_ssize_t for ast sequence lengths Benjamin Peterson <benjamin@python.org> parents: 76948 diff changeset	2920 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	2921 value = PyList_New(n);
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2922 if (!value) goto failed;
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2923 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	2924 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	2925 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2926 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2927 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	2928 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2929 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2930 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	2931 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2932 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	2933 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2934 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2935 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2936 case Call_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2937 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	2938 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	2939 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	2940 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2941 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	2942 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2943 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2944 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	2945 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2946 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	2947 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2948 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2949 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	2950 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2951 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	2952 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2953 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2954 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	2955 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2956 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	2957 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2958 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2959 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	2960 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2961 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	2962 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2963 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2964 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2965 case Num_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2966 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	2967 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	2968 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	2969 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2970 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	2971 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2972 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2973 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2974 case Str_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2975 result = PyType_GenericNew(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	2976 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2977 value = ast2obj_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	2978 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2979 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	2980 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2981 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2982 break;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2983 case Bytes_kind:
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2984 result = PyType_GenericNew(Bytes_type, NULL, NULL);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2985 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	2986 value = ast2obj_bytes(o->v.Bytes.s);
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2987 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	2988 if (_PyObject_SetAttrId(result, &PyId_s, value) == -1)
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2989 goto failed;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2990 Py_DECREF(value);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40893 diff changeset	2991 break;
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	2992 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	2993 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	2994 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	2995 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	2996 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	2997 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	2998 goto failed;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	2999 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	3000 break;
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3001 case Ellipsis_kind:
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3002 result = PyType_GenericNew(Ellipsis_type, NULL, NULL);
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3003 if (!result) goto failed;
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3004 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3005 case Attribute_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3006 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	3007 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	3008 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	3009 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3010 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	3011 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3012 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3013 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	3014 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3015 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	3016 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3017 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3018 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	3019 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3020 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	3021 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3022 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3023 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3024 case Subscript_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3025 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	3026 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	3027 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	3028 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3029 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	3030 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3031 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3032 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	3033 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3034 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	3035 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3036 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3037 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	3038 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3039 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	3040 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3041 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3042 break;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3043 case Starred_kind:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3044 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	3045 if (!result) goto failed;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3046 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	3047 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3048 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	3049 goto failed;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3050 Py_DECREF(value);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3051 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	3052 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3053 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	3054 goto failed;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3055 Py_DECREF(value);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	3056 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3057 case Name_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3058 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	3059 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	3060 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	3061 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3062 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	3063 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3064 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3065 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	3066 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3067 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	3068 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3069 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3070 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3071 case List_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3072 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	3073 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	3074 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	3075 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3076 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	3077 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3078 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3079 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	3080 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3081 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	3082 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3083 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3084 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3085 case Tuple_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3086 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	3087 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	3088 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	3089 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3090 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	3091 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3092 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3093 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	3094 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3095 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	3096 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3097 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3098 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3099 }
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	3100 value = ast2obj_int(o->lineno);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	3101 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3102 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	3103 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	3104 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	3105 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	3106 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3107 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	3108 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	3109 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	3110 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3111 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3112 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3113 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3114 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3115 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3116
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3117 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	3118 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3119 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3120 case Load:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3121 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	3122 return Load_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3123 case Store:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3124 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	3125 return Store_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3126 case Del:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3127 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	3128 return Del_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3129 case AugLoad:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3130 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	3131 return AugLoad_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3132 case AugStore:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3133 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	3134 return AugStore_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3135 case Param:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3136 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	3137 return Param_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3138 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3139 /* 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	3140 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	3141 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3142 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3143 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3144 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3145 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	3146 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3147 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	3148 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	3149 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3150 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	3151 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3152 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3153
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3154 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3155 case Slice_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3156 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	3157 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	3158 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	3159 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3160 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	3161 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3162 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3163 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	3164 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3165 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	3166 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3167 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3168 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	3169 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3170 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	3171 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3172 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3173 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3174 case ExtSlice_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3175 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	3176 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	3177 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	3178 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3179 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	3180 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3181 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3182 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3183 case Index_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3184 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	3185 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	3186 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	3187 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3188 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	3189 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3190 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3191 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3192 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3193 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3194 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3195 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3196 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3197 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3198 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3199
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3200 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	3201 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3202 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3203 case And:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3204 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	3205 return And_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3206 case Or:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3207 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	3208 return Or_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3209 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3210 /* 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	3211 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	3212 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3213 }
36660 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 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	3216 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3217 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3218 case Add:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3219 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	3220 return Add_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3221 case Sub:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3222 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	3223 return Sub_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3224 case Mult:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3225 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	3226 return Mult_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3227 case Div:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3228 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	3229 return Div_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3230 case Mod:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3231 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	3232 return Mod_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3233 case Pow:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3234 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	3235 return Pow_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3236 case LShift:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3237 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	3238 return LShift_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3239 case RShift:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3240 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	3241 return RShift_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3242 case BitOr:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3243 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	3244 return BitOr_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3245 case BitXor:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3246 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	3247 return BitXor_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3248 case BitAnd:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3249 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	3250 return BitAnd_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3251 case FloorDiv:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3252 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	3253 return FloorDiv_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3254 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3255 /* 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	3256 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	3257 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3258 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3259 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3260 PyObject* 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	3261 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3262 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3263 case Invert:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3264 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	3265 return Invert_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3266 case Not:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3267 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	3268 return Not_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3269 case UAdd:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3270 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	3271 return UAdd_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3272 case USub:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3273 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	3274 return USub_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3275 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3276 /* 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	3277 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	3278 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3279 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3280 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3281 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	3282 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3283 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3284 case Eq:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3285 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	3286 return Eq_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3287 case NotEq:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3288 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	3289 return NotEq_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3290 case Lt:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3291 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	3292 return Lt_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3293 case LtE:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3294 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	3295 return LtE_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3296 case Gt:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3297 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	3298 return Gt_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3299 case GtE:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3300 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	3301 return GtE_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3302 case Is:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3303 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	3304 return Is_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3305 case IsNot:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3306 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	3307 return IsNot_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3308 case In:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3309 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	3310 return In_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3311 case NotIn:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3312 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	3313 return NotIn_singleton;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3314 default:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3315 /* 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	3316 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	3317 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3318 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3319 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3320 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3321 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	3322 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3323 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	3324 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	3325 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3326 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	3327 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3328 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3329
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3330 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	3331 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	3332 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	3333 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3334 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	3335 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3336 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3337 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	3338 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3339 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	3340 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3341 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3342 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	3343 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3344 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	3345 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3346 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3347 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3348 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3349 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3350 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3351 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3352 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3353
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3354 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3355 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	3356 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3357 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	3358 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	3359 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3360 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	3361 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3362 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3363
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3364 switch (o->kind) {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3365 case ExceptHandler_kind:
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3366 result = PyType_GenericNew(ExceptHandler_type, NULL, NULL);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3367 if (!result) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3368 value = ast2obj_expr(o->v.ExceptHandler.type);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3369 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3370 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	3371 goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3372 Py_DECREF(value);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3373 value = ast2obj_identifier(o->v.ExceptHandler.name);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3374 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3375 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	3376 goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3377 Py_DECREF(value);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3378 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	3379 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3380 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	3381 goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3382 Py_DECREF(value);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3383 break;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	3384 }
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	3385 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	3386 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3387 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	3388 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	3389 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	3390 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	3391 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3392 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	3393 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	3394 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	3395 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3396 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3397 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3398 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3399 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3400 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3401
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3402 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3403 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	3404 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3405 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	3406 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	3407 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3408 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	3409 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3410 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3411
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3412 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	3413 if (!result) return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3414 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	3415 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3416 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	3417 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3418 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	3419 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	3420 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3421 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	3422 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3423 Py_DECREF(value);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3424 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	3425 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3426 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	3427 goto failed;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	3428 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	3429 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	3430 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	3431 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	3432 goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3433 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	3434 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	3435 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3436 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	3437 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3438 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3439 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	3440 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3441 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	3442 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3443 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3444 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3445 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3446 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3447 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3448 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3449 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3450
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3451 PyObject*
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3452 ast2obj_arg(void* _o)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3453 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3454 arg_ty o = (arg_ty)_o;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3455 PyObject result = NULL, value = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3456 if (!o) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3457 Py_INCREF(Py_None);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3458 return Py_None;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3459 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3460
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3461 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	3462 if (!result) return NULL;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3463 value = ast2obj_identifier(o->arg);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3464 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3465 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	3466 goto failed;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3467 Py_DECREF(value);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3468 value = ast2obj_expr(o->annotation);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3469 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3470 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	3471 goto failed;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	3472 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	3473 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	3474 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	3475 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	3476 goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3477 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	3478 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	3479 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	3480 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	3481 goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3482 Py_DECREF(value);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3483 return result;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3484 failed:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3485 Py_XDECREF(value);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3486 Py_XDECREF(result);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3487 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3488 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3489
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	3490 PyObject*
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3491 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	3492 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3493 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	3494 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	3495 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3496 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	3497 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3498 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3499
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3500 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	3501 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	3502 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	3503 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3504 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	3505 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3506 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3507 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	3508 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3509 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	3510 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3511 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3512 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3513 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3514 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3515 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3516 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3517 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3518
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3519 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3520 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	3521 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3522 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	3523 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	3524 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3525 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	3526 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3527 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3528
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3529 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	3530 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	3531 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	3532 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3533 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	3534 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3535 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3536 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	3537 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3538 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	3539 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3540 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3541 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3542 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3543 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3544 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3545 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3546 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3547
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3548 PyObject*
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3549 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	3550 {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3551 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	3552 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	3553 if (!o) {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3554 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	3555 return Py_None;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3556 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3557
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3558 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	3559 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	3560 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	3561 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3562 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	3563 goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3564 Py_DECREF(value);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	3565 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	3566 if (!value) goto failed;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	3567 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	3568 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3569 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3570 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3571 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3572 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3573 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3574 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3575 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3576
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3577
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3578 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3579 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	3580 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	3581 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	3582
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	3583 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3584
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3585 if (obj == Py_None) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3586 *out = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3587 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3588 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3589 isinstance = PyObject_IsInstance(obj, (PyObject*)Module_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3590 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3591 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3592 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3593 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3594 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3595
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3596 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	3597 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3598 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3599 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3600 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	3601 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3602 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3603 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	3604 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3605 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3606 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3607 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	3608 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3609 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	3610 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3611 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	3612 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3613 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	3614 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3615 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3616 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3617 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3618 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	3619 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3620 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3621 *out = Module(body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3622 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3623 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3624 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3625 isinstance = PyObject_IsInstance(obj, (PyObject*)Interactive_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3626 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3627 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3628 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3629 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3630 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3631
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3632 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	3633 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3634 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3635 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3636 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	3637 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3638 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3639 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	3640 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3641 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3642 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3643 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	3644 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3645 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	3646 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3647 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	3648 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3649 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	3650 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3651 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3652 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3653 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3654 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	3655 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3656 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3657 *out = Interactive(body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3658 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3659 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3660 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3661 isinstance = PyObject_IsInstance(obj, (PyObject*)Expression_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3662 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3663 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3664 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3665 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3666 expr_ty body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3667
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3668 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	3669 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3670 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	3671 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3672 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	3673 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3674 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3675 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3676 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3677 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	3678 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3679 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3680 *out = Expression(body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3681 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3682 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3683 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3684 isinstance = PyObject_IsInstance(obj, (PyObject*)Suite_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3685 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3686 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3687 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3688 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3689 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3690
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3691 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	3692 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3693 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3694 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3695 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	3696 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3697 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3698 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	3699 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3700 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3701 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3702 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	3703 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3704 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	3705 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3706 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	3707 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3708 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	3709 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3710 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3711 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3712 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3713 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	3714 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3715 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3716 *out = Suite(body, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3717 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3718 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3719 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3720
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	3721 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	3722 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	3723 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3724 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3725 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3726
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3727 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3728 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	3729 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	3730 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	3731
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	3732 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3733 int lineno;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3734 int col_offset;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3735
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3736 if (obj == Py_None) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3737 *out = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3738 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3739 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3740 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	3741 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3742 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	3743 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3744 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	3745 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3746 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3747 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3748 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3749 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	3750 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3751 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3752 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	3753 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3754 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	3755 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3756 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	3757 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3758 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3759 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3760 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3761 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	3762 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3763 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3764 isinstance = PyObject_IsInstance(obj, (PyObject*)FunctionDef_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3765 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3766 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3767 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3768 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3769 identifier name;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3770 arguments_ty args;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3771 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3772 asdl_seq* decorator_list;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3773 expr_ty returns;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3774
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3775 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	3776 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3777 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	3778 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3779 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	3780 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3781 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3782 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3783 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3784 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	3785 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3786 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3787 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	3788 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3789 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	3790 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3791 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	3792 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3793 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3794 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3795 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3796 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	3797 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3798 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3799 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	3800 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3801 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3802 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3803 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	3804 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3805 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3806 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	3807 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3808 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3809 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3810 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	3811 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3812 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	3813 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3814 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	3815 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3816 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	3817 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3818 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3819 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3820 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3821 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	3822 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3823 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3824 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	3825 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3826 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3827 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3828 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	3829 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3830 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3831 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	3832 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3833 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3834 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3835 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	3836 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	3837 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	3838 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3839 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	3840 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3841 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	3842 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3843 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3844 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3845 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3846 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	3847 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3848 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3849 if (_PyObject_HasAttrId(obj, &PyId_returns) && _PyObject_GetAttrId(obj, &PyId_returns) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3850 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3851 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	3852 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3853 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	3854 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3855 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3856 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3857 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3858 returns = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3859 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3860 *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	3861 lineno, col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3862 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3863 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3864 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3865 isinstance = PyObject_IsInstance(obj, (PyObject*)ClassDef_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3866 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3867 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3868 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	3869 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3870 identifier name;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3871 asdl_seq* bases;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3872 asdl_seq* keywords;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3873 expr_ty starargs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3874 expr_ty kwargs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3875 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3876 asdl_seq* decorator_list;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3877
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3878 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	3879 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3880 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	3881 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3882 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	3883 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3884 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3885 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3886 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3887 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	3888 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3889 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3890 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	3891 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3892 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3893 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3894 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	3895 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3896 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3897 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	3898 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3899 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3900 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3901 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	3902 if (bases == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3903 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	3904 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3905 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	3906 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3907 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	3908 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3909 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3910 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3911 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3912 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	3913 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3914 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3915 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	3916 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3917 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3918 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3919 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	3920 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3921 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3922 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	3923 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3924 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3925 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3926 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	3927 if (keywords == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3928 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	3929 keyword_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3930 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	3931 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3932 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	3933 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3934 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3935 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3936 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3937 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	3938 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3939 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3940 if (_PyObject_HasAttrId(obj, &PyId_starargs) && _PyObject_GetAttrId(obj, &PyId_starargs) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3941 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3942 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	3943 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3944 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	3945 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3946 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3947 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3948 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3949 starargs = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3950 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	3951 if (_PyObject_HasAttrId(obj, &PyId_kwargs) && _PyObject_GetAttrId(obj, &PyId_kwargs) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3952 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3953 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	3954 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3955 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	3956 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3957 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3958 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3959 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3960 kwargs = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3961 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3962 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	3963 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3964 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3965 Py_ssize_t i;
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_body);
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 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3969 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	3970 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3971 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3972 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3973 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	3974 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3975 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	3976 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3977 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	3978 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3979 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	3980 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3981 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3982 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3983 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3984 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	3985 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3986 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3987 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	3988 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3989 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3990 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	3991 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	3992 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3993 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3994 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	3995 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3996 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3997 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	3998 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	3999 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	4000 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	4001 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4002 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	4003 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4004 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	4005 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4006 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4007 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4008 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4009 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	4010 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4011 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4012 *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	4013 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	4014 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4015 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4016 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4017 isinstance = PyObject_IsInstance(obj, (PyObject*)Return_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4018 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4019 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4020 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4021 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4022 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4023
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	4024 if (_PyObject_HasAttrId(obj, &PyId_value) && _PyObject_GetAttrId(obj, &PyId_value) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4025 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4026 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	4027 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4028 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	4029 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4030 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4031 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4032 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4033 value = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4034 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4035 *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	4036 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4037 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4038 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4039 isinstance = PyObject_IsInstance(obj, (PyObject*)Delete_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4040 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4041 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4042 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4043 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4044 asdl_seq* targets;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4045
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4046 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	4047 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4048 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4049 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4050 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	4051 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4052 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4053 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	4054 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4055 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4056 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4057 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	4058 if (targets == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4059 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	4060 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4061 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	4062 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4063 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	4064 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4065 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4066 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4067 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4068 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	4069 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4070 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4071 *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	4072 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4073 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4074 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4075 isinstance = PyObject_IsInstance(obj, (PyObject*)Assign_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4076 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4077 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4078 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4079 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4080 asdl_seq* targets;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4081 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4082
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4083 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	4084 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4085 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4086 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4087 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	4088 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4089 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4090 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	4091 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4092 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4093 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4094 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	4095 if (targets == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4096 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	4097 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4098 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	4099 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4100 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	4101 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4102 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4103 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4104 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4105 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	4106 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4107 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4108 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	4109 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4110 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	4111 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4112 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	4113 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4114 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4115 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4116 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4117 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	4118 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4119 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4120 *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	4121 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4122 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4123 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4124 isinstance = PyObject_IsInstance(obj, (PyObject*)AugAssign_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4125 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4126 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4127 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4128 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4129 expr_ty target;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4130 operator_ty op;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4131 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4132
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4133 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	4134 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4135 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	4136 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4137 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	4138 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4139 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4140 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4141 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4142 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	4143 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4144 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4145 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	4146 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4147 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	4148 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4149 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	4150 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4151 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4152 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4153 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4154 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	4155 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4156 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4157 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	4158 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4159 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	4160 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4161 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	4162 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4163 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4164 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4165 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4166 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	4167 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4168 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4169 *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	4170 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4171 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4172 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4173 isinstance = PyObject_IsInstance(obj, (PyObject*)For_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4174 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4175 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4176 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4177 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4178 expr_ty target;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4179 expr_ty iter;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4180 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4181 asdl_seq* orelse;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4182
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4183 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	4184 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4185 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	4186 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4187 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	4188 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4189 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4190 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4191 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4192 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	4193 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4194 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4195 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	4196 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4197 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	4198 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4199 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	4200 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4201 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4202 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4203 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4204 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	4205 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4206 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4207 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	4208 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4209 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4210 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4211 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	4212 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4213 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4214 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	4215 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4216 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4217 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4218 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	4219 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4220 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	4221 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4222 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	4223 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4224 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	4225 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4226 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4227 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4228 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4229 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	4230 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4231 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4232 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	4233 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4234 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4235 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4236 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	4237 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4238 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4239 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	4240 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4241 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4242 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4243 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	4244 if (orelse == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4245 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	4246 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4247 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	4248 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4249 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	4250 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4251 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4252 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4253 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4254 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	4255 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4256 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4257 *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	4258 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4259 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4260 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4261 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4262 isinstance = PyObject_IsInstance(obj, (PyObject*)While_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4263 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4264 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4265 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4266 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4267 expr_ty test;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4268 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4269 asdl_seq* orelse;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4270
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4271 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	4272 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4273 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	4274 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4275 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	4276 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4277 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4278 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4279 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4280 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	4281 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4282 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4283 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	4284 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4285 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4286 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4287 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	4288 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4289 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4290 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	4291 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4292 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4293 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4294 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	4295 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4296 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	4297 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4298 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	4299 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4300 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	4301 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4302 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4303 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4304 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4305 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	4306 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4307 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4308 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	4309 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4310 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4311 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4312 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	4313 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4314 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4315 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	4316 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4317 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4318 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4319 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	4320 if (orelse == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4321 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	4322 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4323 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	4324 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4325 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	4326 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4327 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4328 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4329 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4330 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	4331 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4332 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4333 *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	4334 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4335 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4336 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4337 isinstance = PyObject_IsInstance(obj, (PyObject*)If_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4338 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4339 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4340 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4341 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4342 expr_ty test;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4343 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4344 asdl_seq* orelse;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4345
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4346 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	4347 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4348 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	4349 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4350 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	4351 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4352 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4353 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4354 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4355 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	4356 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4357 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4358 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	4359 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4360 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4361 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4362 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	4363 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4364 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4365 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	4366 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4367 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4368 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4369 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	4370 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4371 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	4372 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4373 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	4374 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4375 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	4376 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4377 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4378 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4379 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4380 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	4381 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4382 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4383 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	4384 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4385 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4386 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4387 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	4388 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4389 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4390 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	4391 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4392 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4393 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4394 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	4395 if (orelse == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4396 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	4397 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4398 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	4399 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4400 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	4401 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4402 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4403 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4404 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4405 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	4406 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4407 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4408 *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	4409 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4410 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4411 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4412 isinstance = PyObject_IsInstance(obj, (PyObject*)With_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4413 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4414 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4415 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4416 if (isinstance) {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4417 asdl_seq* items;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4418 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4419
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4420 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	4421 int res;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4422 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	4423 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4424 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	4425 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	4426 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	4427 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	4428 goto failed;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4429 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4430 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	4431 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	4432 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	4433 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	4434 withitem_ty value;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4435 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	4436 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	4437 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	4438 }
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4439 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4440 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4441 } else {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4442 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	4443 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4444 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4445 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	4446 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4447 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4448 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4449 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	4450 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4451 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4452 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	4453 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4454 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4455 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4456 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	4457 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4458 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	4459 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4460 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	4461 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4462 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	4463 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4464 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4465 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4466 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4467 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	4468 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4469 }
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	4470 *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	4471 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4472 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4473 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4474 isinstance = PyObject_IsInstance(obj, (PyObject*)Raise_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4475 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4476 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4477 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4478 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4479 expr_ty exc;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4480 expr_ty cause;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4481
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	4482 if (_PyObject_HasAttrId(obj, &PyId_exc) && _PyObject_GetAttrId(obj, &PyId_exc) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4483 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4484 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	4485 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4486 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	4487 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4488 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4489 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4490 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4491 exc = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4492 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	4493 if (_PyObject_HasAttrId(obj, &PyId_cause) && _PyObject_GetAttrId(obj, &PyId_cause) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4494 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4495 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	4496 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4497 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	4498 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4499 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4500 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4501 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4502 cause = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4503 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4504 *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	4505 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4506 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4507 }
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4508 isinstance = PyObject_IsInstance(obj, (PyObject*)Try_type);
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4509 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4510 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4511 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4512 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4513 asdl_seq* body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4514 asdl_seq* handlers;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4515 asdl_seq* orelse;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4516 asdl_seq* finalbody;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4517
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4518 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	4519 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4520 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4521 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4522 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	4523 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4524 if (!PyList_Check(tmp)) {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4525 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	4526 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4527 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4528 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4529 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	4530 if (body == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4531 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	4532 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4533 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	4534 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4535 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	4536 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4537 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4538 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4539 } else {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4540 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	4541 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4542 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4543 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	4544 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4545 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4546 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4547 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	4548 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4549 if (!PyList_Check(tmp)) {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4550 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	4551 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4552 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4553 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4554 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	4555 if (handlers == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4556 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	4557 excepthandler_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4558 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	4559 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4560 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	4561 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4562 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4563 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4564 } else {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4565 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	4566 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4567 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4568 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	4569 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4570 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4571 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4572 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	4573 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4574 if (!PyList_Check(tmp)) {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4575 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	4576 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4577 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4578 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4579 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	4580 if (orelse == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4581 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	4582 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4583 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	4584 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4585 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	4586 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4587 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4588 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4589 } else {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4590 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	4591 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4592 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4593 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	4594 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4595 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4596 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4597 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	4598 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4599 if (!PyList_Check(tmp)) {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4600 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	4601 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4602 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4603 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4604 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	4605 if (finalbody == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4606 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	4607 stmt_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4608 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	4609 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4610 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	4611 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4612 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4613 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4614 } else {
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4615 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	4616 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4617 }
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4618 *out = Try(body, handlers, orelse, finalbody, lineno,
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	4619 col_offset, arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4620 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4621 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4622 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4623 isinstance = PyObject_IsInstance(obj, (PyObject*)Assert_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4624 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4625 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4626 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4627 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4628 expr_ty test;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4629 expr_ty msg;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4630
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4631 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	4632 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4633 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	4634 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4635 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	4636 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4637 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4638 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4639 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4640 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	4641 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4642 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	4643 if (_PyObject_HasAttrId(obj, &PyId_msg) && _PyObject_GetAttrId(obj, &PyId_msg) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4644 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4645 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	4646 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4647 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	4648 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4649 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4650 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4651 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4652 msg = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4653 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4654 *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	4655 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4656 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4657 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4658 isinstance = PyObject_IsInstance(obj, (PyObject*)Import_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4659 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4660 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4661 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4662 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4663 asdl_seq* names;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4664
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4665 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	4666 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4667 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4668 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4669 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	4670 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4671 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4672 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	4673 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4674 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4675 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4676 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	4677 if (names == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4678 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	4679 alias_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4680 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	4681 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4682 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	4683 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4684 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4685 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4686 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4687 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	4688 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4689 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4690 *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	4691 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4692 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4693 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4694 isinstance = PyObject_IsInstance(obj, (PyObject*)ImportFrom_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4695 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4696 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4697 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4698 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4699 identifier module;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4700 asdl_seq* names;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4701 int level;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4702
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	4703 if (_PyObject_HasAttrId(obj, &PyId_module) && _PyObject_GetAttrId(obj, &PyId_module) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4704 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4705 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	4706 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4707 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	4708 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4709 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4710 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4711 } 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	4712 module = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4713 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4714 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	4715 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4716 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4717 Py_ssize_t i;
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_names);
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 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4721 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	4722 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4723 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4724 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4725 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	4726 if (names == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4727 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	4728 alias_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4729 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	4730 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4731 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	4732 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4733 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4734 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4735 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4736 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	4737 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4738 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	4739 if (_PyObject_HasAttrId(obj, &PyId_level) && _PyObject_GetAttrId(obj, &PyId_level) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4740 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4741 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	4742 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4743 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	4744 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4745 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4746 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4747 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4748 level = 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4749 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4750 *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	4751 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4752 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4753 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4754 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4755 isinstance = PyObject_IsInstance(obj, (PyObject*)Global_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4756 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4757 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4758 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4759 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4760 asdl_seq* names;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4761
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4762 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	4763 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4764 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4765 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4766 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	4767 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4768 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4769 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	4770 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4771 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4772 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4773 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	4774 if (names == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4775 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	4776 identifier value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4777 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	4778 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4779 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	4780 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4781 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4782 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4783 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4784 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	4785 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4786 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4787 *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	4788 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4789 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4790 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4791 isinstance = PyObject_IsInstance(obj, (PyObject*)Nonlocal_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4792 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4793 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4794 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4795 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4796 asdl_seq* names;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4797
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4798 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	4799 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4800 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4801 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4802 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	4803 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4804 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4805 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	4806 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4807 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4808 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4809 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	4810 if (names == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4811 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	4812 identifier value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4813 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	4814 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4815 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	4816 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4817 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4818 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4819 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4820 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	4821 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4822 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4823 *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	4824 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4825 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4826 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4827 isinstance = PyObject_IsInstance(obj, (PyObject*)Expr_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4828 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4829 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4830 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4831 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4832 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4833
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4834 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	4835 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4836 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	4837 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4838 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	4839 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4840 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4841 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4842 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4843 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	4844 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4845 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4846 *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	4847 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4848 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4849 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4850 isinstance = PyObject_IsInstance(obj, (PyObject*)Pass_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4851 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4852 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4853 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4854 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4855
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4856 *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	4857 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4858 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4859 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4860 isinstance = PyObject_IsInstance(obj, (PyObject*)Break_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4861 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4862 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4863 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4864 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4865
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4866 *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	4867 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4868 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4869 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4870 isinstance = PyObject_IsInstance(obj, (PyObject*)Continue_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4871 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4872 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4873 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4874 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4875
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4876 *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	4877 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4878 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4879 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4880
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	4881 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	4882 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	4883 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4884 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4885 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4886
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4887 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4888 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	4889 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	4890 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	4891
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	4892 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4893 int lineno;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4894 int col_offset;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4895
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4896 if (obj == Py_None) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4897 *out = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4898 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4899 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4900 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	4901 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4902 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	4903 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4904 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	4905 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4906 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4907 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4908 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4909 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	4910 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4911 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4912 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	4913 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4914 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	4915 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4916 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	4917 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4918 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4919 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4920 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4921 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	4922 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4923 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4924 isinstance = PyObject_IsInstance(obj, (PyObject*)BoolOp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4925 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4926 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4927 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4928 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4929 boolop_ty op;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4930 asdl_seq* values;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4931
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4932 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	4933 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4934 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	4935 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4936 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	4937 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4938 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4939 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4940 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4941 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	4942 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4943 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4944 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	4945 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4946 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4947 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4948 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	4949 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4950 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4951 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	4952 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4953 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4954 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4955 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	4956 if (values == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4957 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	4958 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4959 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	4960 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4961 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	4962 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4963 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4964 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4965 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4966 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	4967 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4968 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4969 *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	4970 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4971 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4972 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4973 isinstance = PyObject_IsInstance(obj, (PyObject*)BinOp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4974 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4975 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4976 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	4977 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4978 expr_ty left;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4979 operator_ty op;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4980 expr_ty right;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4981
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4982 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	4983 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4984 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	4985 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4986 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	4987 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4988 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4989 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4990 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4991 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	4992 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4993 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4994 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	4995 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	4996 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	4997 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	4998 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	4999 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5000 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5001 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5002 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5003 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	5004 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5005 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5006 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	5007 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5008 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	5009 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5010 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	5011 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5012 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5013 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5014 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5015 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	5016 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5017 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5018 *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	5019 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5020 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5021 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5022 isinstance = PyObject_IsInstance(obj, (PyObject*)UnaryOp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5023 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5024 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5025 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5026 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5027 unaryop_ty op;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5028 expr_ty operand;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5029
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5030 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	5031 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5032 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	5033 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5034 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	5035 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5036 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5037 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5038 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5039 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	5040 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5041 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5042 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	5043 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5044 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	5045 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5046 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	5047 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5048 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5049 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5050 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5051 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	5052 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5053 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5054 *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	5055 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5056 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5057 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5058 isinstance = PyObject_IsInstance(obj, (PyObject*)Lambda_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5059 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5060 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5061 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5062 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5063 arguments_ty args;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5064 expr_ty body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5065
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5066 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	5067 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5068 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	5069 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5070 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	5071 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5072 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5073 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5074 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5075 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	5076 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5077 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5078 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	5079 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5080 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	5081 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5082 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	5083 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5084 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5085 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5086 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5087 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	5088 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5089 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5090 *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	5091 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5092 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5093 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5094 isinstance = PyObject_IsInstance(obj, (PyObject*)IfExp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5095 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5096 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5097 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5098 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5099 expr_ty test;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5100 expr_ty body;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5101 expr_ty orelse;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5102
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5103 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	5104 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5105 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	5106 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5107 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	5108 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5109 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5110 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5111 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5112 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	5113 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5114 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5115 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	5116 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5117 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	5118 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5119 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	5120 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5121 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5122 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5123 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5124 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	5125 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5126 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5127 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	5128 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5129 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	5130 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5131 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	5132 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5133 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5134 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5135 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5136 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	5137 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5138 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5139 *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	5140 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5141 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5142 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5143 isinstance = PyObject_IsInstance(obj, (PyObject*)Dict_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5144 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5145 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5146 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5147 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5148 asdl_seq* keys;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5149 asdl_seq* values;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5150
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5151 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	5152 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5153 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5154 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5155 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	5156 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5157 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5158 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	5159 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5160 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5161 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5162 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	5163 if (keys == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5164 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	5165 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5166 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	5167 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5168 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	5169 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5170 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5171 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5172 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5173 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	5174 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5175 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5176 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	5177 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5178 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5179 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5180 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	5181 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5182 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5183 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	5184 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5185 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5186 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5187 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	5188 if (values == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5189 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	5190 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5191 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	5192 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5193 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	5194 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5195 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5196 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5197 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5198 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	5199 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5200 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5201 *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	5202 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5203 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5204 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5205 isinstance = PyObject_IsInstance(obj, (PyObject*)Set_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5206 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5207 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5208 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5209 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5210 asdl_seq* elts;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5211
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5212 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	5213 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5214 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5215 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5216 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	5217 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5218 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5219 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	5220 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5221 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5222 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5223 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	5224 if (elts == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5225 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	5226 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5227 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	5228 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5229 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	5230 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5231 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5232 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5233 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5234 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	5235 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5236 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5237 *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	5238 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5239 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5240 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5241 isinstance = PyObject_IsInstance(obj, (PyObject*)ListComp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5242 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5243 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5244 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5245 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5246 expr_ty elt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5247 asdl_seq* generators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5248
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5249 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	5250 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5251 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	5252 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5253 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	5254 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5255 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5256 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5257 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5258 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	5259 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5260 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5261 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	5262 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5263 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5264 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5265 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	5266 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5267 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5268 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	5269 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5270 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5271 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5272 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	5273 if (generators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5274 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	5275 comprehension_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5276 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	5277 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5278 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	5279 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5280 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5281 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5282 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5283 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	5284 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5285 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5286 *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	5287 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5288 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5289 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5290 isinstance = PyObject_IsInstance(obj, (PyObject*)SetComp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5291 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5292 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5293 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5294 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5295 expr_ty elt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5296 asdl_seq* generators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5297
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5298 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	5299 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5300 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	5301 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5302 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	5303 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5304 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5305 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5306 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5307 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	5308 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5309 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5310 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	5311 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5312 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5313 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5314 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	5315 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5316 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5317 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	5318 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5319 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5320 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5321 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	5322 if (generators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5323 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	5324 comprehension_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5325 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	5326 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5327 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	5328 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5329 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5330 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5331 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5332 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	5333 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5334 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5335 *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	5336 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5337 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5338 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5339 isinstance = PyObject_IsInstance(obj, (PyObject*)DictComp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5340 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5341 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5342 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5343 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5344 expr_ty key;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5345 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5346 asdl_seq* generators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5347
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5348 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	5349 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5350 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	5351 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5352 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	5353 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5354 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5355 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5356 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5357 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	5358 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5359 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5360 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	5361 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5362 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	5363 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5364 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	5365 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5366 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5367 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5368 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5369 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	5370 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5371 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5372 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	5373 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5374 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5375 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5376 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	5377 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5378 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5379 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	5380 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5381 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5382 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5383 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	5384 if (generators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5385 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	5386 comprehension_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5387 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	5388 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5389 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	5390 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5391 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5392 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5393 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5394 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	5395 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5396 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5397 *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	5398 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5399 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5400 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5401 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5402 isinstance = PyObject_IsInstance(obj, (PyObject*)GeneratorExp_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5403 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5404 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5405 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5406 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5407 expr_ty elt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5408 asdl_seq* generators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5409
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5410 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	5411 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5412 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	5413 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5414 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	5415 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5416 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5417 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5418 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5419 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	5420 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5421 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5422 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	5423 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5424 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5425 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5426 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	5427 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5428 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5429 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	5430 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5431 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5432 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5433 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	5434 if (generators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5435 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	5436 comprehension_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5437 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	5438 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5439 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	5440 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5441 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5442 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5443 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5444 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	5445 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5446 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5447 *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	5448 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5449 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5450 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5451 isinstance = PyObject_IsInstance(obj, (PyObject*)Yield_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5452 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5453 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5454 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5455 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5456 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5457
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	5458 if (_PyObject_HasAttrId(obj, &PyId_value) && _PyObject_GetAttrId(obj, &PyId_value) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5459 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5460 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	5461 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5462 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	5463 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5464 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5465 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5466 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5467 value = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5468 }
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5469 *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	5470 if (*out == NULL) goto failed;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5471 return 0;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5472 }
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5473 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	5474 if (isinstance == -1) {
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5475 return 1;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5476 }
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5477 if (isinstance) {
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5478 expr_ty value;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5479
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5480 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	5481 int res;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5482 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	5483 if (tmp == NULL) goto failed;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5484 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	5485 if (res != 0) goto failed;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5486 Py_XDECREF(tmp);
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5487 tmp = NULL;
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5488 } else {
80589 ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78006 diff changeset	5489 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	5490 return 1;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5491 }
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	5492 *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	5493 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5494 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5495 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5496 isinstance = PyObject_IsInstance(obj, (PyObject*)Compare_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5497 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5498 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5499 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5500 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5501 expr_ty left;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5502 asdl_int_seq* ops;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5503 asdl_seq* comparators;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5504
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5505 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	5506 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5507 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	5508 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5509 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	5510 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5511 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5512 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5513 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5514 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	5515 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5516 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5517 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	5518 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5519 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5520 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5521 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	5522 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5523 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5524 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	5525 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5526 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5527 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5528 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	5529 if (ops == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5530 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	5531 cmpop_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5532 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	5533 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5534 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	5535 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5536 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5537 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5538 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5539 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	5540 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5541 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5542 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	5543 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5544 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5545 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5546 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	5547 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5548 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5549 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	5550 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5551 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5552 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5553 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	5554 if (comparators == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5555 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	5556 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5557 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	5558 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5559 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	5560 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5561 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5562 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5563 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5564 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	5565 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5566 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5567 *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	5568 arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5569 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5570 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5571 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5572 isinstance = PyObject_IsInstance(obj, (PyObject*)Call_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5573 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5574 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5575 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5576 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5577 expr_ty func;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5578 asdl_seq* args;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5579 asdl_seq* keywords;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5580 expr_ty starargs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5581 expr_ty kwargs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5582
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5583 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	5584 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5585 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	5586 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5587 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	5588 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5589 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5590 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5591 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5592 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	5593 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5594 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5595 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	5596 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5597 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5598 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5599 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	5600 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5601 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5602 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	5603 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5604 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5605 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5606 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	5607 if (args == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5608 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	5609 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5610 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	5611 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5612 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	5613 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5614 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5615 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5616 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5617 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	5618 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5619 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5620 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	5621 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5622 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5623 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5624 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	5625 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5626 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5627 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	5628 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5629 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5630 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5631 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	5632 if (keywords == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5633 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	5634 keyword_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5635 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	5636 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5637 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	5638 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5639 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5640 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5641 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5642 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	5643 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5644 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	5645 if (_PyObject_HasAttrId(obj, &PyId_starargs) && _PyObject_GetAttrId(obj, &PyId_starargs) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5646 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5647 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	5648 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5649 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	5650 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5651 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5652 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5653 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5654 starargs = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5655 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	5656 if (_PyObject_HasAttrId(obj, &PyId_kwargs) && _PyObject_GetAttrId(obj, &PyId_kwargs) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5657 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5658 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	5659 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5660 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	5661 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5662 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5663 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5664 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5665 kwargs = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5666 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5667 *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	5668 col_offset, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5669 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5670 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5671 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5672 isinstance = PyObject_IsInstance(obj, (PyObject*)Num_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5673 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5674 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5675 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5676 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5677 object n;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5678
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5679 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	5680 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5681 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	5682 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5683 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	5684 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5685 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5686 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5687 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5688 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	5689 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5690 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5691 *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	5692 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5693 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5694 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5695 isinstance = PyObject_IsInstance(obj, (PyObject*)Str_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5696 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5697 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5698 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5699 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5700 string s;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5701
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5702 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	5703 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5704 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	5705 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5706 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	5707 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5708 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5709 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5710 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5711 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	5712 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5713 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5714 *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	5715 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5716 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5717 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5718 isinstance = PyObject_IsInstance(obj, (PyObject*)Bytes_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5719 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5720 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5721 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5722 if (isinstance) {
71792 f578ca44193d add a asdl bytes type, so Bytes.s be properly typechecked Benjamin Peterson <benjamin@python.org> parents: 71459 diff changeset	5723 bytes s;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5724
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5725 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	5726 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5727 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	5728 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	5729 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	5730 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5731 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5732 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5733 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5734 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	5735 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5736 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5737 *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	5738 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5739 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5740 }
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5741 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	5742 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	5743 return 1;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5744 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5745 if (isinstance) {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5746 singleton value;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5747
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5748 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	5749 int res;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5750 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	5751 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	5752 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	5753 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	5754 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	5755 tmp = NULL;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5756 } else {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5757 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	5758 return 1;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5759 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5760 *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	5761 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	5762 return 0;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	5763 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5764 isinstance = PyObject_IsInstance(obj, (PyObject*)Ellipsis_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5765 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5766 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5767 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5768 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5769
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5770 *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	5771 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5772 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5773 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5774 isinstance = PyObject_IsInstance(obj, (PyObject*)Attribute_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5775 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5776 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5777 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5778 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5779 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5780 identifier attr;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5781 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5782
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5783 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	5784 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5785 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	5786 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5787 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	5788 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5789 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5790 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5791 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5792 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	5793 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5794 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5795 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	5796 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5797 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	5798 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5799 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	5800 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5801 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5802 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5803 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5804 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	5805 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5806 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5807 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	5808 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5809 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	5810 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5811 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	5812 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5813 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5814 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5815 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5816 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	5817 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5818 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5819 *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	5820 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5821 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5822 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5823 isinstance = PyObject_IsInstance(obj, (PyObject*)Subscript_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5824 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5825 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5826 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5827 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5828 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5829 slice_ty slice;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5830 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5831
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5832 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	5833 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5834 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	5835 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5836 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	5837 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5838 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5839 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5840 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5841 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	5842 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5843 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5844 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	5845 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5846 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	5847 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5848 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	5849 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5850 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5851 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5852 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5853 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	5854 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5855 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5856 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	5857 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5858 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	5859 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5860 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	5861 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5862 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5863 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5864 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5865 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	5866 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5867 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5868 *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	5869 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5870 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5871 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5872 isinstance = PyObject_IsInstance(obj, (PyObject*)Starred_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5873 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5874 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5875 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5876 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5877 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5878 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5879
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5880 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	5881 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5882 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	5883 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5884 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	5885 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5886 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5887 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5888 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5889 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	5890 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5891 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5892 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	5893 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5894 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	5895 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5896 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	5897 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5898 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5899 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5900 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5901 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	5902 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5903 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5904 *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	5905 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5906 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5907 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5908 isinstance = PyObject_IsInstance(obj, (PyObject*)Name_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5909 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5910 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5911 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5912 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5913 identifier id;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5914 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5915
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5916 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	5917 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5918 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	5919 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5920 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	5921 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5922 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5923 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5924 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5925 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	5926 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5927 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5928 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	5929 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5930 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	5931 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5932 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	5933 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5934 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5935 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5936 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5937 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	5938 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5939 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5940 *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	5941 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5942 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5943 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5944 isinstance = PyObject_IsInstance(obj, (PyObject*)List_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5945 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5946 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5947 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5948 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5949 asdl_seq* elts;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5950 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5951
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5952 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	5953 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5954 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5955 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5956 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	5957 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5958 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5959 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	5960 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5961 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5962 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5963 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	5964 if (elts == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5965 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	5966 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5967 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	5968 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5969 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	5970 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5971 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5972 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5973 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5974 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	5975 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5976 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5977 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	5978 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	5979 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	5980 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5981 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	5982 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5983 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5984 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5985 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5986 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	5987 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5988 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5989 *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	5990 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5991 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5992 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5993 isinstance = PyObject_IsInstance(obj, (PyObject*)Tuple_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5994 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5995 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5996 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	5997 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5998 asdl_seq* elts;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	5999 expr_context_ty ctx;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6000
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6001 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	6002 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6003 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6004 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6005 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	6006 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6007 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6008 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	6009 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6010 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6011 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6012 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	6013 if (elts == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6014 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	6015 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6016 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	6017 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6018 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	6019 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6020 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6021 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6022 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6023 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	6024 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6025 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6026 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	6027 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6028 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	6029 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6030 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	6031 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6032 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6033 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6034 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6035 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	6036 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6037 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6038 *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	6039 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6040 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6041 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6042
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6043 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	6044 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	6045 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6046 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6047 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6048
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6049 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6050 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	6051 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6052 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6053
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6054 isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6055 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6056 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6057 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6058 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6059 *out = Load;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6060 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6061 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6062 isinstance = PyObject_IsInstance(obj, (PyObject *)Store_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6063 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6064 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6065 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6066 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6067 *out = Store;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6068 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6069 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6070 isinstance = PyObject_IsInstance(obj, (PyObject *)Del_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6071 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6072 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6073 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6074 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6075 *out = Del;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6076 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6077 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6078 isinstance = PyObject_IsInstance(obj, (PyObject *)AugLoad_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6079 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6080 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6081 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6082 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6083 *out = AugLoad;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6084 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6085 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6086 isinstance = PyObject_IsInstance(obj, (PyObject *)AugStore_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6087 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6088 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6089 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6090 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6091 *out = AugStore;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6092 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6093 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6094 isinstance = PyObject_IsInstance(obj, (PyObject *)Param_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6095 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6096 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6097 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6098 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6099 *out = Param;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6100 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6101 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6102
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6103 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	6104 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6105 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6106
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6107 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6108 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	6109 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6110 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	6111
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	6112 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6113
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6114 if (obj == Py_None) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6115 *out = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6116 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6117 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6118 isinstance = PyObject_IsInstance(obj, (PyObject*)Slice_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6119 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6120 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6121 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6122 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6123 expr_ty lower;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6124 expr_ty upper;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6125 expr_ty step;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6126
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6127 if (_PyObject_HasAttrId(obj, &PyId_lower) && _PyObject_GetAttrId(obj, &PyId_lower) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6128 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6129 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	6130 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6131 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	6132 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6133 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6134 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6135 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6136 lower = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6137 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6138 if (_PyObject_HasAttrId(obj, &PyId_upper) && _PyObject_GetAttrId(obj, &PyId_upper) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6139 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6140 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	6141 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6142 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	6143 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6144 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6145 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6146 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6147 upper = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6148 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6149 if (_PyObject_HasAttrId(obj, &PyId_step) && _PyObject_GetAttrId(obj, &PyId_step) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6150 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6151 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	6152 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6153 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	6154 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6155 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6156 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6157 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6158 step = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6159 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6160 *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	6161 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6162 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6163 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6164 isinstance = PyObject_IsInstance(obj, (PyObject*)ExtSlice_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6165 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6166 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6167 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6168 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6169 asdl_seq* dims;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6170
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6171 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	6172 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6173 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6174 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6175 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	6176 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6177 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6178 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	6179 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6180 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6181 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6182 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	6183 if (dims == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6184 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	6185 slice_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6186 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	6187 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6188 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	6189 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6190 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6191 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6192 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6193 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	6194 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6195 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6196 *out = ExtSlice(dims, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6197 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6198 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6199 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6200 isinstance = PyObject_IsInstance(obj, (PyObject*)Index_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6201 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6202 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6203 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6204 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6205 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6206
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6207 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	6208 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6209 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	6210 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6211 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	6212 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6213 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6214 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6215 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6216 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	6217 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6218 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6219 *out = Index(value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6220 if (*out == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6221 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6222 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6223
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6224 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	6225 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	6226 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6227 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6228 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6229
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6230 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6231 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	6232 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6233 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6234
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6235 isinstance = PyObject_IsInstance(obj, (PyObject *)And_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6236 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6237 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6238 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6239 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6240 *out = And;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6241 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6242 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6243 isinstance = PyObject_IsInstance(obj, (PyObject *)Or_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6244 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6245 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6246 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6247 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6248 *out = Or;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6249 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6250 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6251
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6252 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	6253 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6254 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6255
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6256 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6257 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	6258 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6259 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6260
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6261 isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6262 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6263 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6264 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6265 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6266 *out = Add;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6267 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6268 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6269 isinstance = PyObject_IsInstance(obj, (PyObject *)Sub_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6270 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6271 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6272 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6273 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6274 *out = Sub;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6275 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6276 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6277 isinstance = PyObject_IsInstance(obj, (PyObject *)Mult_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6278 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6279 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6280 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6281 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6282 *out = Mult;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6283 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6284 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6285 isinstance = PyObject_IsInstance(obj, (PyObject *)Div_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6286 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6287 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6288 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6289 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6290 *out = Div;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6291 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6292 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6293 isinstance = PyObject_IsInstance(obj, (PyObject *)Mod_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6294 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6295 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6296 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6297 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6298 *out = Mod;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6299 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6300 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6301 isinstance = PyObject_IsInstance(obj, (PyObject *)Pow_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6302 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6303 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6304 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6305 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6306 *out = Pow;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6307 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6308 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6309 isinstance = PyObject_IsInstance(obj, (PyObject *)LShift_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6310 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6311 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6312 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6313 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6314 *out = LShift;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6315 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6316 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6317 isinstance = PyObject_IsInstance(obj, (PyObject *)RShift_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6318 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6319 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6320 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6321 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6322 *out = RShift;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6323 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6324 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6325 isinstance = PyObject_IsInstance(obj, (PyObject *)BitOr_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6326 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6327 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6328 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6329 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6330 *out = BitOr;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6331 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6332 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6333 isinstance = PyObject_IsInstance(obj, (PyObject *)BitXor_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6334 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6335 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6336 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6337 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6338 *out = BitXor;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6339 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6340 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6341 isinstance = PyObject_IsInstance(obj, (PyObject *)BitAnd_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6342 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6343 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6344 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6345 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6346 *out = BitAnd;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6347 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6348 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6349 isinstance = PyObject_IsInstance(obj, (PyObject *)FloorDiv_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6350 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6351 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6352 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6353 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6354 *out = FloorDiv;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6355 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6356 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6357
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6358 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	6359 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6360 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6361
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6362 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6363 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	6364 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6365 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6366
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6367 isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6368 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6369 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6370 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6371 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6372 *out = Invert;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6373 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6374 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6375 isinstance = PyObject_IsInstance(obj, (PyObject *)Not_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6376 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6377 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6378 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6379 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6380 *out = Not;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6381 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6382 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6383 isinstance = PyObject_IsInstance(obj, (PyObject *)UAdd_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6384 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6385 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6386 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6387 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6388 *out = UAdd;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6389 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6390 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6391 isinstance = PyObject_IsInstance(obj, (PyObject *)USub_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6392 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6393 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6394 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6395 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6396 *out = USub;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6397 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6398 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6399
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6400 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	6401 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6402 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6403
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6404 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6405 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	6406 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6407 int isinstance;
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6408
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6409 isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6410 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6411 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6412 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6413 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6414 *out = Eq;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6415 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6416 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6417 isinstance = PyObject_IsInstance(obj, (PyObject *)NotEq_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6418 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6419 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6420 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6421 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6422 *out = NotEq;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6423 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6424 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6425 isinstance = PyObject_IsInstance(obj, (PyObject *)Lt_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6426 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6427 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6428 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6429 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6430 *out = Lt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6431 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6432 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6433 isinstance = PyObject_IsInstance(obj, (PyObject *)LtE_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6434 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6435 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6436 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6437 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6438 *out = LtE;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6439 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6440 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6441 isinstance = PyObject_IsInstance(obj, (PyObject *)Gt_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6442 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6443 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6444 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6445 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6446 *out = Gt;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6447 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6448 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6449 isinstance = PyObject_IsInstance(obj, (PyObject *)GtE_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6450 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6451 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6452 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6453 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6454 *out = GtE;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6455 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6456 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6457 isinstance = PyObject_IsInstance(obj, (PyObject *)Is_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6458 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6459 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6460 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6461 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6462 *out = Is;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6463 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6464 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6465 isinstance = PyObject_IsInstance(obj, (PyObject *)IsNot_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6466 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6467 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6468 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6469 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6470 *out = IsNot;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6471 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6472 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6473 isinstance = PyObject_IsInstance(obj, (PyObject *)In_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6474 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6475 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6476 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6477 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6478 *out = In;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6479 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6480 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6481 isinstance = PyObject_IsInstance(obj, (PyObject *)NotIn_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6482 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6483 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6484 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6485 if (isinstance) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6486 *out = NotIn;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6487 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6488 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6489
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6490 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	6491 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6492 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6493
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6494 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6495 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	6496 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6497 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6498 expr_ty target;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6499 expr_ty iter;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6500 asdl_seq* ifs;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6501
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6502 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	6503 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6504 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	6505 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6506 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	6507 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6508 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6509 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6510 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6511 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	6512 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6513 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6514 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	6515 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6516 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	6517 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6518 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	6519 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6520 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6521 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6522 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6523 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	6524 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6525 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6526 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	6527 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6528 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6529 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6530 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	6531 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6532 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6533 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	6534 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6535 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6536 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6537 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	6538 if (ifs == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6539 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	6540 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6541 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	6542 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6543 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	6544 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6545 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6546 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6547 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6548 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	6549 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6550 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6551 *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	6552 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6553 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6554 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6555 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6556 }
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 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6559 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	6560 {
66256 51f72c5fe28e Merged revisions 86540 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66254 diff changeset	6561 int isinstance;
66261 d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	6562
d22aa5ae7762 Merged revisions 86545 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 66256 diff changeset	6563 PyObject *tmp = NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6564 int lineno;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6565 int col_offset;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6566
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6567 if (obj == Py_None) {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6568 *out = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6569 return 0;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6570 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6571 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	6572 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6573 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	6574 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6575 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	6576 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6577 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6578 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6579 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6580 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	6581 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6582 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6583 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	6584 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6585 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	6586 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6587 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	6588 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6589 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6590 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6591 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6592 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	6593 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6594 }
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6595 isinstance = PyObject_IsInstance(obj, (PyObject*)ExceptHandler_type);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6596 if (isinstance == -1) {
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6597 return 1;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6598 }
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	6599 if (isinstance) {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6600 expr_ty type;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6601 identifier name;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6602 asdl_seq* body;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6603
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6604 if (_PyObject_HasAttrId(obj, &PyId_type) && _PyObject_GetAttrId(obj, &PyId_type) != Py_None) {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6605 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6606 tmp = _PyObject_GetAttrId(obj, &PyId_type);
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6607 if (tmp == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6608 res = obj2ast_expr(tmp, &type, arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6609 if (res != 0) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6610 Py_XDECREF(tmp);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6611 tmp = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6612 } else {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6613 type = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6614 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6615 if (_PyObject_HasAttrId(obj, &PyId_name) && _PyObject_GetAttrId(obj, &PyId_name) != Py_None) {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6616 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6617 tmp = _PyObject_GetAttrId(obj, &PyId_name);
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6618 if (tmp == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6619 res = obj2ast_identifier(tmp, &name, arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6620 if (res != 0) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6621 Py_XDECREF(tmp);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6622 tmp = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6623 } else {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6624 name = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6625 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6626 if (_PyObject_HasAttrId(obj, &PyId_body)) {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6627 int res;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6628 Py_ssize_t len;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6629 Py_ssize_t i;
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_body);
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 if (!PyList_Check(tmp)) {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6633 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	6634 goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6635 }
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6636 len = PyList_GET_SIZE(tmp);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6637 body = asdl_seq_new(len, arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6638 if (body == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6639 for (i = 0; i < len; i++) {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6640 stmt_ty value;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6641 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	6642 if (res != 0) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6643 asdl_seq_SET(body, i, value);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6644 }
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6645 Py_XDECREF(tmp);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6646 tmp = NULL;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6647 } else {
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6648 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	6649 return 1;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6650 }
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6651 *out = ExceptHandler(type, name, body, lineno, col_offset,
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6652 arena);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6653 if (*out == NULL) goto failed;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6654 return 0;
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6655 }
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	6656
66254 350898e095aa Merged revisions 86538 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 57677 diff changeset	6657 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	6658 failed:
66352 61d1ec307bb0 fix refleak Benjamin Peterson <benjamin@python.org> parents: 66260 diff changeset	6659 Py_XDECREF(tmp);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6660 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6661 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6662
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6663 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6664 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	6665 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6666 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6667 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	6668 arg_ty vararg;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6669 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	6670 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	6671 arg_ty kwarg;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6672 asdl_seq* defaults;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6673
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6674 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	6675 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6676 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6677 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6678 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	6679 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6680 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6681 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	6682 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6683 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6684 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6685 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	6686 if (args == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6687 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	6688 arg_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6689 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	6690 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6691 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	6692 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6693 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6694 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6695 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6696 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	6697 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6698 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6699 if (_PyObject_HasAttrId(obj, &PyId_vararg) && _PyObject_GetAttrId(obj, &PyId_vararg) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6700 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6701 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	6702 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	6703 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	6704 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6705 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6706 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6707 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6708 vararg = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6709 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6710 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	6711 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6712 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6713 Py_ssize_t i;
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_kwonlyargs);
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;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6716 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6717 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	6718 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6719 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6720 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6721 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	6722 if (kwonlyargs == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6723 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	6724 arg_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6725 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	6726 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6727 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	6728 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6729 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6730 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6731 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6732 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	6733 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6734 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6735 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	6736 int res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6737 Py_ssize_t len;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6738 Py_ssize_t i;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6739 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	6740 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6741 if (!PyList_Check(tmp)) {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6742 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	6743 goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6744 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6745 len = PyList_GET_SIZE(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6746 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	6747 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	6748 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	6749 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6750 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	6751 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6752 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	6753 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6754 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6755 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6756 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6757 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	6758 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6759 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6760 if (_PyObject_HasAttrId(obj, &PyId_kwarg) && _PyObject_GetAttrId(obj, &PyId_kwarg) != Py_None) {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6761 int res;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6762 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	6763 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	6764 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	6765 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	6766 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	6767 tmp = NULL;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6768 } else {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6769 kwarg = NULL;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6770 }
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6771 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	6772 int res;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6773 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	6774 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	6775 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	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 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	6778 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	6779 goto failed;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6780 }
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6781 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	6782 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	6783 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	6784 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	6785 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	6786 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	6787 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	6788 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	6789 }
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6790 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	6791 tmp = NULL;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6792 } else {
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6793 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	6794 return 1;
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6795 }
7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6796 *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	6797 defaults, arena);
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6798 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6799 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6800 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6801 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6802 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6803
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6804 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6805 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	6806 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6807 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6808 identifier arg;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6809 expr_ty annotation;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6810
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6811 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	6812 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6813 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	6814 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6815 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	6816 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6817 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6818 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6819 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6820 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	6821 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6822 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6823 if (_PyObject_HasAttrId(obj, &PyId_annotation) && _PyObject_GetAttrId(obj, &PyId_annotation) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6824 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6825 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	6826 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6827 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	6828 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6829 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6830 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6831 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6832 annotation = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6833 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6834 *out = arg(arg, annotation, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6835 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6836 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6837 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6838 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6839 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6840
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6841 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6842 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	6843 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6844 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6845 identifier arg;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6846 expr_ty value;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6847
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6848 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	6849 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6850 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	6851 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6852 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	6853 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6854 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6855 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6856 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6857 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	6858 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6859 }
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6860 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	6861 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6862 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	6863 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6864 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	6865 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6866 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6867 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6868 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6869 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	6870 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6871 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6872 *out = keyword(arg, value, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6873 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6874 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6875 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6876 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6877 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6878
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6879 int
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6880 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	6881 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6882 PyObject* tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6883 identifier name;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6884 identifier asname;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6885
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6886 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	6887 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6888 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	6889 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6890 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	6891 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6892 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6893 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6894 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6895 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	6896 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6897 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6898 if (_PyObject_HasAttrId(obj, &PyId_asname) && _PyObject_GetAttrId(obj, &PyId_asname) != Py_None) {
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6899 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6900 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	6901 if (tmp == NULL) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6902 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	6903 if (res != 0) goto failed;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6904 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6905 tmp = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6906 } else {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6907 asname = NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6908 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6909 *out = alias(name, asname, arena);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6910 return 0;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6911 failed:
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6912 Py_XDECREF(tmp);
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6913 return 1;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6914 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6915
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6916 int
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6917 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	6918 {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6919 PyObject* tmp = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6920 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	6921 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	6922
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6923 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	6924 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6925 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	6926 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	6927 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	6928 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	6929 Py_XDECREF(tmp);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6930 tmp = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6931 } else {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6932 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	6933 return 1;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6934 }
82732 7c5c678e4164 unify some ast.argument's attrs; change Attribute column offset (closes #16795) Benjamin Peterson <benjamin@python.org> parents: 81039 diff changeset	6935 if (_PyObject_HasAttrId(obj, &PyId_optional_vars) && _PyObject_GetAttrId(obj, &PyId_optional_vars) != Py_None) {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6936 int res;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72195 diff changeset	6937 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	6938 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	6939 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	6940 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	6941 Py_XDECREF(tmp);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6942 tmp = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6943 } else {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6944 optional_vars = NULL;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6945 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6946 *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	6947 return 0;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6948 failed:
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6949 Py_XDECREF(tmp);
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6950 return 1;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6951 }
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	6952
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	6953
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6954 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	6955 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	6956 };
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6957 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	6958 PyInit__ast(void)
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6959 {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6960 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	6961 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	6962 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	6963 if (!m) return NULL;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6964 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	6965 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	6966 NULL;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6967 if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", 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	6968 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6969 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	6970 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	6971 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	6972 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	6973 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	6974 < 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	6975 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	6976 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	6977 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	6978 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6979 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	6980 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	6981 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	6982 < 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	6983 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	6984 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	6985 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	6986 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	6987 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	6988 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	6989 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	6990 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	6991 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	6992 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	6993 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	6994 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6995 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	6996 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	6997 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	6998 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	6999 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7000 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	7001 NULL;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70439 diff changeset	7002 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	7003 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, "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	7005 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	7006 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	7007 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	7008 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	7009 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	7010 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	7011 return NULL;
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	7012 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	7013 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7014 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	7015 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7016 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	7017 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7018 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	7019 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	7020 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	7021 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7022 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	7023 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	7024 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	7025 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7026 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	7027 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	7028 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	7029 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	7030 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	7031 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7032 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	7033 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7034 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	7035 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7036 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	7037 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	7038 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	7039 return NULL;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41227 diff changeset	7040 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	7041 return NULL;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	7042 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	7043 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	7044 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	7045 (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	7046 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	7047 NULL;
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74358 diff changeset	7048 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	7049 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	7050 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	7051 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7052 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	7053 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7054 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	7055 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7056 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	7057 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7058 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	7059 NULL;
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	7060 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	7061 (PyObject*)NameConstant_type) < 0) return NULL;
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	7062 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	7063 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	7064 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	7065 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	7066 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	7067 0) return NULL;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41471 diff changeset	7068 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	7069 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7070 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	7071 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7072 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	7073 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7074 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	7075 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	7076 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	7077 (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	7078 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	7079 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7080 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	7081 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7082 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	7083 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	7084 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	7085 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	7086 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	7087 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7088 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	7089 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7090 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	7091 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7092 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	7093 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	7094 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	7095 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7096 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	7097 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	7098 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	7099 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7100 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	7101 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7102 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	7103 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	7104 return 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, "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	7106 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7107 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	7108 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, "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	7110 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7111 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	7112 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, "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	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, "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	7116 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	7117 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	7118 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	7119 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	7120 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7121 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	7122 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	7123 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	7124 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	7125 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	7126 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	7127 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	7128 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	7129 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	7130 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	7131 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	7132 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7133 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	7134 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7135 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	7136 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7137 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	7138 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7139 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	7140 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7141 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	7142 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	7143 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7144 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	7145 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	7146 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7147 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	7148 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	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, "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	7151 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	7152 NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7153 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	7154 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	7155 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	7156 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	7157 (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	7158 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	7159 (PyObject*)excepthandler_type) < 0) return NULL;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46229 diff changeset	7160 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	7161 (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	7162 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	7163 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, "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	7165 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	7166 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	7167 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	7168 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	7169 NULL;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 68428 diff changeset	7170 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	7171 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	7172 return m;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	7173 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	7174
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7175
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	7176 PyObject* PyAST_mod2obj(mod_ty t)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7177 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	7178 init_types();
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	7179 return ast2obj_mod(t);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7180 }
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41825 diff changeset	7181
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7182 /* 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	7183 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	7184 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7185 mod_ty res;
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7186 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	7187 (PyObject*)Interactive_type};
b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7188 char *req_name[] = {"Module", "Expression", "Interactive"};
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7189 int isinstance;
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7190 assert(0 <= mode && mode <= 2);
b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7191
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7192 init_types();
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7193
57677 1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7194 isinstance = PyObject_IsInstance(ast, req_type[mode]);
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7195 if (isinstance == -1)
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7196 return NULL;
1558dc69aacf Merged revisions 76776 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	7197 if (!isinstance) {
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46215 diff changeset	7198 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	7199 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	7200 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7201 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7202 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	7203 return NULL;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7204 else
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7205 return res;
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7206 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7207
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7208 int PyAST_Check(PyObject* obj)
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7209 {
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7210 init_types();
46229 07b36d2b7534 Merged revisions 62049,62054 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46227 diff changeset	7211 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	7212 }
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7213
ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45495 diff changeset	7214

Mercurial > cpython-lru_cache-weakref

annotate Python/Python-ast.c @ 82732:7c5c678e4164