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

annotate Python/symtable.c @ 40529:54cd47788811

PEP 3107 - Function Annotations thanks to Tony Lownds

author	Neal Norwitz <nnorwitz@gmail.com>
date	Thu, 28 Dec 2006 06:47:50 +0000
parents	1cce0526d9b0
children	4bab65fcca8e

rev	line source
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	1 #include "Python.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	2 #include "Python-ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	3 #include "code.h"
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	4 #include "symtable.h"
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	5 #include "structmember.h"
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	6
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	7 /* error strings used for warnings */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	8 #define GLOBAL_AFTER_ASSIGN \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	9 "name '%.400s' is assigned to before global declaration"
21325 8a26bb369f53 Add a comment explaining the st_symbols cache. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21314 diff changeset	10
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	11 #define GLOBAL_AFTER_USE \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	12 "name '%.400s' is used prior to global declaration"
21325 8a26bb369f53 Add a comment explaining the st_symbols cache. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21314 diff changeset	13
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	14 #define IMPORT_STAR_WARNING "import * only allowed at module level"
4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	15
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	16 #define RETURN_VAL_IN_GENERATOR \
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	17 "'return' with argument inside generator"
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	18
36739 796d150e45a9 No need to export PySTEntry_New, it is only used in symtable.c Neal Norwitz <nnorwitz@gmail.com> parents: 36695 diff changeset	19 /* XXX(nnorwitz): change name since static? */
796d150e45a9 No need to export PySTEntry_New, it is only used in symtable.c Neal Norwitz <nnorwitz@gmail.com> parents: 36695 diff changeset	20 static PySTEntryObject *
35793 914ec0afa51c Do not pollute name block_ty, prefix with _Py_ Neal Norwitz <nnorwitz@gmail.com> parents: 35780 diff changeset	21 PySTEntry_New(struct symtable *st, identifier name, _Py_block_ty block,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	22 void *key, int lineno)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	23 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	24 PySTEntryObject *ste = NULL;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	25 PyObject *k;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	26
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	27 k = PyLong_FromVoidPtr(key);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	28 if (k == NULL)
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	29 goto fail;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	30 ste = (PySTEntryObject *)PyObject_New(PySTEntryObject,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	31 &PySTEntry_Type);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	32 ste->ste_table = st;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	33 ste->ste_id = k;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	34 ste->ste_tmpname = 0;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	35
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	36 ste->ste_name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	37 Py_INCREF(name);
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	38
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	39 ste->ste_symbols = NULL;
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	40 ste->ste_varnames = NULL;
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	41 ste->ste_children = NULL;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	42
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	43 ste->ste_symbols = PyDict_New();
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	44 if (ste->ste_symbols == NULL)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	45 goto fail;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	46
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	47 ste->ste_varnames = PyList_New(0);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	48 if (ste->ste_varnames == NULL)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	49 goto fail;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	50
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	51 ste->ste_children = PyList_New(0);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	52 if (ste->ste_children == NULL)
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	53 goto fail;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	54
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	55 ste->ste_type = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	56 ste->ste_unoptimized = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	57 ste->ste_nested = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	58 ste->ste_free = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	59 ste->ste_varargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	60 ste->ste_varkeywords = 0;
21179 485422900ef0 SF bug #488687 reported by Neal Norwitz Jeremy Hylton <jeremy@alum.mit.edu> parents: 21090 diff changeset	61 ste->ste_opt_lineno = 0;
29226 3aaf24b949df Backport fix for SF bug 734869 and sundry compiler cleanups. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21325 diff changeset	62 ste->ste_tmpname = 0;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	63 ste->ste_lineno = lineno;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	64
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	65 if (st->st_cur != NULL &&
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	66 (st->st_cur->ste_nested \|\|
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	67 st->st_cur->ste_type == FunctionBlock))
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	68 ste->ste_nested = 1;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	69 ste->ste_child_free = 0;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 16799 diff changeset	70 ste->ste_generator = 0;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	71 ste->ste_returns_value = 0;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	72
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	73 if (PyDict_SetItem(st->st_symbols, ste->ste_id, (PyObject *)ste) < 0)
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	74 goto fail;
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16539 diff changeset	75
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	76 return ste;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	77 fail:
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	78 Py_XDECREF(ste);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	79 return NULL;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	80 }
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	81
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	82 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	83 ste_repr(PySTEntryObject *ste)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	84 {
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	85 char buf[256];
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	86
21090 5e25c669741c ste_repr(): Conversion of sprintf() to PyOS_snprintf() for buffer Barry Warsaw <barry@python.org> parents: 20012 diff changeset	87 PyOS_snprintf(buf, sizeof(buf),
5e25c669741c ste_repr(): Conversion of sprintf() to PyOS_snprintf() for buffer Barry Warsaw <barry@python.org> parents: 20012 diff changeset	88 "<symtable entry %.100s(%ld), line %d>",
5e25c669741c ste_repr(): Conversion of sprintf() to PyOS_snprintf() for buffer Barry Warsaw <barry@python.org> parents: 20012 diff changeset	89 PyString_AS_STRING(ste->ste_name),
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	90 PyInt_AS_LONG(ste->ste_id), ste->ste_lineno);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	91 return PyString_FromString(buf);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	92 }
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	93
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	94 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	95 ste_dealloc(PySTEntryObject *ste)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	96 {
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	97 ste->ste_table = NULL;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	98 Py_XDECREF(ste->ste_id);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	99 Py_XDECREF(ste->ste_name);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	100 Py_XDECREF(ste->ste_symbols);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	101 Py_XDECREF(ste->ste_varnames);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	102 Py_XDECREF(ste->ste_children);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	103 PyObject_Del(ste);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	104 }
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	105
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	106 #define OFF(x) offsetof(PySTEntryObject, x)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	107
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	108 static PyMemberDef ste_memberlist[] = {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	109 {"id", T_OBJECT, OFF(ste_id), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	110 {"name", T_OBJECT, OFF(ste_name), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	111 {"symbols", T_OBJECT, OFF(ste_symbols), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	112 {"varnames", T_OBJECT, OFF(ste_varnames), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	113 {"children", T_OBJECT, OFF(ste_children), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	114 {"type", T_INT, OFF(ste_type), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	115 {"lineno", T_INT, OFF(ste_lineno), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	116 {NULL}
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	117 };
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	118
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	119 PyTypeObject PySTEntry_Type = {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	120 PyObject_HEAD_INIT(&PyType_Type)
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	121 0,
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	122 "symtable entry",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	123 sizeof(PySTEntryObject),
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	124 0,
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	125 (destructor)ste_dealloc, /* tp_dealloc */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	126 0, /* tp_print */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	127 0, /* tp_getattr */
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	128 0, /* tp_setattr */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	129 0, /* tp_compare */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	130 (reprfunc)ste_repr, /* tp_repr */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	131 0, /* tp_as_number */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	132 0, /* tp_as_sequence */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	133 0, /* tp_as_mapping */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	134 0, /* tp_hash */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	135 0, /* tp_call */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	136 0, /* tp_str */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	137 PyObject_GenericGetAttr, /* tp_getattro */
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	138 0, /* tp_setattro */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	139 0, /* tp_as_buffer */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	140 Py_TPFLAGS_DEFAULT, /* tp_flags */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	141 0, /* tp_doc */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	142 0, /* tp_traverse */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	143 0, /* tp_clear */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	144 0, /* tp_richcompare */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	145 0, /* tp_weaklistoffset */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	146 0, /* tp_iter */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	147 0, /* tp_iternext */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	148 0, /* tp_methods */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	149 ste_memberlist, /* tp_members */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	150 0, /* tp_getset */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	151 0, /* tp_base */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	152 0, /* tp_dict */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	153 0, /* tp_descr_get */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	154 0, /* tp_descr_set */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	155 0, /* tp_dictoffset */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	156 0, /* tp_init */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	157 0, /* tp_alloc */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	158 0, /* tp_new */
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	159 };
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	160
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	161 static int symtable_analyze(struct symtable *st);
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	162 static int symtable_warn(struct symtable st, char msg, int lineno);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	163 static int symtable_enter_block(struct symtable *st, identifier name,
35793 914ec0afa51c Do not pollute name block_ty, prefix with _Py_ Neal Norwitz <nnorwitz@gmail.com> parents: 35780 diff changeset	164 _Py_block_ty block, void *ast, int lineno);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	165 static int symtable_exit_block(struct symtable st, void ast);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	166 static int symtable_visit_stmt(struct symtable *st, stmt_ty s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	167 static int symtable_visit_expr(struct symtable *st, expr_ty s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	168 static int symtable_visit_genexp(struct symtable *st, expr_ty s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	169 static int symtable_visit_arguments(struct symtable *st, arguments_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	170 static int symtable_visit_excepthandler(struct symtable *st, excepthandler_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	171 static int symtable_visit_alias(struct symtable *st, alias_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	172 static int symtable_visit_comprehension(struct symtable *st, comprehension_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	173 static int symtable_visit_keyword(struct symtable *st, keyword_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	174 static int symtable_visit_slice(struct symtable *st, slice_ty);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	175 static int symtable_visit_params(struct symtable st, asdl_seq args, int top,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	176 int annotations);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	177 static int symtable_visit_params_nested(struct symtable st, asdl_seq args,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	178 int annotations);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	179 static int symtable_implicit_arg(struct symtable *st, int pos);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	180 static int symtable_visit_annotations(struct symtable *st, stmt_ty s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	181
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	182
35880 0d1e2e73c3ec Bring handling of genexpr in line with other anonymous scope names Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	183 static identifier top = NULL, lambda = NULL, genexpr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	184
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	185 #define GET_IDENTIFIER(VAR) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	186 ((VAR) ? (VAR) : ((VAR) = PyString_InternFromString(# VAR)))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	187
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	188 #define DUPLICATE_ARGUMENT \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	189 "duplicate argument '%s' in function definition"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	190
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	191 static struct symtable *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	192 symtable_new(void)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	193 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	194 struct symtable *st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	195
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	196 st = (struct symtable *)PyMem_Malloc(sizeof(struct symtable));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	197 if (st == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	198 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	199
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	200 st->st_filename = NULL;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	201 st->st_symbols = NULL;
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	202
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	203 if ((st->st_stack = PyList_New(0)) == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	204 goto fail;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	205 if ((st->st_symbols = PyDict_New()) == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	206 goto fail;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	207 st->st_cur = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	208 st->st_tmpname = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	209 st->st_private = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	210 return st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	211 fail:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	212 PySymtable_Free(st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	213 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	214 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	215
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	216 struct symtable *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	217 PySymtable_Build(mod_ty mod, const char filename, PyFutureFeatures future)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	218 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	219 struct symtable *st = symtable_new();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	220 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	221 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	222
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	223 if (st == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	224 return st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	225 st->st_filename = filename;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	226 st->st_future = future;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	227 if (!GET_IDENTIFIER(top) \|\|
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	228 !symtable_enter_block(st, top, ModuleBlock, (void *)mod, 0)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	229 PySymtable_Free(st);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	230 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	231 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	232
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	233 st->st_top = st->st_cur;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	234 st->st_cur->ste_unoptimized = OPT_TOPLEVEL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	235 /* Any other top-level initialization? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	236 switch (mod->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	237 case Module_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	238 seq = mod->v.Module.body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	239 for (i = 0; i < asdl_seq_LEN(seq); i++)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	240 if (!symtable_visit_stmt(st,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	241 (stmt_ty)asdl_seq_GET(seq, i)))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	242 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	243 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	244 case Expression_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	245 if (!symtable_visit_expr(st, mod->v.Expression.body))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	246 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	247 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	248 case Interactive_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	249 seq = mod->v.Interactive.body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	250 for (i = 0; i < asdl_seq_LEN(seq); i++)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	251 if (!symtable_visit_stmt(st,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	252 (stmt_ty)asdl_seq_GET(seq, i)))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	253 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	254 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	255 case Suite_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	256 PyErr_SetString(PyExc_RuntimeError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	257 "this compiler does not handle Suites");
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	258 goto error;
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	259 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	260 if (!symtable_exit_block(st, (void *)mod)) {
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	261 PySymtable_Free(st);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	262 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	263 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	264 if (symtable_analyze(st))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	265 return st;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	266 PySymtable_Free(st);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	267 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	268 error:
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	269 (void) symtable_exit_block(st, (void *)mod);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	270 PySymtable_Free(st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	271 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	272 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	273
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	274 void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	275 PySymtable_Free(struct symtable *st)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	276 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	277 Py_XDECREF(st->st_symbols);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	278 Py_XDECREF(st->st_stack);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	279 PyMem_Free((void *)st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	280 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	281
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	282 PySTEntryObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	283 PySymtable_Lookup(struct symtable st, void key)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	284 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	285 PyObject k, v;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	286
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	287 k = PyLong_FromVoidPtr(key);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	288 if (k == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	289 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	290 v = PyDict_GetItem(st->st_symbols, k);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	291 if (v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	292 assert(PySTEntry_Check(v));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	293 Py_INCREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	294 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	295 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	296 PyErr_SetString(PyExc_KeyError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	297 "unknown symbol table entry");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	298 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	299
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	300 Py_DECREF(k);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	301 return (PySTEntryObject *)v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	302 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	303
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	304 int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	305 PyST_GetScope(PySTEntryObject ste, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	306 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	307 PyObject *v = PyDict_GetItem(ste->ste_symbols, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	308 if (!v)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	309 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	310 assert(PyInt_Check(v));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	311 return (PyInt_AS_LONG(v) >> SCOPE_OFF) & SCOPE_MASK;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	312 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	313
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	314
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	315 /* Analyze raw symbol information to determine scope of each name.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	316
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	317 The next several functions are helpers for PySymtable_Analyze(),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	318 which determines whether a name is local, global, or free. In addition,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	319 it determines which local variables are cell variables; they provide
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	320 bindings that are used for free variables in enclosed blocks.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	321
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	322 There are also two kinds of free variables, implicit and explicit. An
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	323 explicit global is declared with the global statement. An implicit
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	324 global is a free variable for which the compiler has found no binding
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	325 in an enclosing function scope. The implicit global is either a global
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	326 or a builtin. Python's module and class blocks use the xxx_NAME opcodes
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	327 to handle these names to implement slightly odd semantics. In such a
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	328 block, the name is treated as global until it is assigned to; then it
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	329 is treated as a local.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	330
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	331 The symbol table requires two passes to determine the scope of each name.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	332 The first pass collects raw facts from the AST: the name is a parameter
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	333 here, the name is used by not defined here, etc. The second pass analyzes
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	334 these facts during a pass over the PySTEntryObjects created during pass 1.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	335
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	336 When a function is entered during the second pass, the parent passes
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	337 the set of all name bindings visible to its children. These bindings
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	338 are used to determine if the variable is free or an implicit global.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	339 After doing the local analysis, it analyzes each of its child blocks
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	340 using an updated set of name bindings.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	341
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	342 The children update the free variable set. If a local variable is free
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	343 in a child, the variable is marked as a cell. The current function must
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	344 provide runtime storage for the variable that may outlive the function's
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	345 frame. Cell variables are removed from the free set before the analyze
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	346 function returns to its parent.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	347
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	348 The sets of bound and free variables are implemented as dictionaries
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	349 mapping strings to None.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	350 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	351
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	352 #define SET_SCOPE(DICT, NAME, I) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	353 PyObject *o = PyInt_FromLong(I); \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	354 if (!o) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	355 return 0; \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	356 if (PyDict_SetItem((DICT), (NAME), o) < 0) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	357 Py_DECREF(o); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	358 return 0; \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	359 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	360 Py_DECREF(o); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	361 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	362
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	363 /* Decide on scope of name, given flags.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	364
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	365 The dicts passed in as arguments are modified as necessary.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	366 ste is passed so that flags can be updated.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	367 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	368
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	369 static int
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	370 analyze_name(PySTEntryObject ste, PyObject dict, PyObject *name, long flags,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	371 PyObject bound, PyObject local, PyObject *free,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	372 PyObject *global)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	373 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	374 if (flags & DEF_GLOBAL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	375 if (flags & DEF_PARAM) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	376 PyErr_Format(PyExc_SyntaxError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	377 "name '%s' is local and global",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	378 PyString_AS_STRING(name));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	379 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	380 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	381 SET_SCOPE(dict, name, GLOBAL_EXPLICIT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	382 if (PyDict_SetItem(global, name, Py_None) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	383 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	384 if (bound && PyDict_GetItem(bound, name)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	385 if (PyDict_DelItem(bound, name) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	386 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	387 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	388 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	389 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	390 if (flags & DEF_BOUND) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	391 SET_SCOPE(dict, name, LOCAL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	392 if (PyDict_SetItem(local, name, Py_None) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	393 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	394 if (PyDict_GetItem(global, name)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	395 if (PyDict_DelItem(global, name) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	396 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	397 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	398 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	399 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	400 /* If an enclosing block has a binding for this name, it
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	401 is a free variable rather than a global variable.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	402 Note that having a non-NULL bound implies that the block
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	403 is nested.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	404 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	405 if (bound && PyDict_GetItem(bound, name)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	406 SET_SCOPE(dict, name, FREE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	407 ste->ste_free = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	408 if (PyDict_SetItem(free, name, Py_None) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	409 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	410 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	411 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	412 /* If a parent has a global statement, then call it global
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	413 explicit? It could also be global implicit.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	414 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	415 else if (global && PyDict_GetItem(global, name)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	416 SET_SCOPE(dict, name, GLOBAL_EXPLICIT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	417 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	418 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	419 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	420 if (ste->ste_nested)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	421 ste->ste_free = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	422 SET_SCOPE(dict, name, GLOBAL_IMPLICIT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	423 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	424 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	425 return 0; /* Can't get here */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	426 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	427
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	428 #undef SET_SCOPE
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	429
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	430 /* If a name is defined in free and also in locals, then this block
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	431 provides the binding for the free variable. The name should be
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	432 marked CELL in this block and removed from the free list.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	433
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	434 Note that the current block's free variables are included in free.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	435 That's safe because no name can be free and local in the same scope.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	436 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	437
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	438 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	439 analyze_cells(PyObject scope, PyObject free)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	440 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	441 PyObject name, v, *w;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	442 int success = 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	443 Py_ssize_t pos = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	444
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	445 w = PyInt_FromLong(CELL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	446 if (!w)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	447 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	448 while (PyDict_Next(scope, &pos, &name, &v)) {
36240 af7d484208e9 analyze_cells(): This no longer compiled under VC 7.1. Tim Peters <tim.peters@gmail.com> parents: 36231 diff changeset	449 long flags;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	450 assert(PyInt_Check(v));
36240 af7d484208e9 analyze_cells(): This no longer compiled under VC 7.1. Tim Peters <tim.peters@gmail.com> parents: 36231 diff changeset	451 flags = PyInt_AS_LONG(v);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	452 if (flags != LOCAL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	453 continue;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	454 if (!PyDict_GetItem(free, name))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	455 continue;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	456 /* Replace LOCAL with CELL for this name, and remove
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	457 from free. It is safe to replace the value of name
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	458 in the dict, because it will not cause a resize.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	459 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	460 if (PyDict_SetItem(scope, name, w) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	461 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	462 if (!PyDict_DelItem(free, name) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	463 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	464 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	465 success = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	466 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	467 Py_DECREF(w);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	468 return success;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	469 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	470
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	471 /* Check for illegal statements in unoptimized namespaces */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	472 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	473 check_unoptimized(const PySTEntryObject* ste) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	474 char buf[300];
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	475 const char* trailer;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	476
35780 72cb041ccde3 Fix check_unoptimized() function. The only optimized namespaces are Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35779 diff changeset	477 if (ste->ste_type != FunctionBlock \|\| !ste->ste_unoptimized
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	478 \|\| !(ste->ste_free \|\| ste->ste_child_free))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	479 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	480
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	481 trailer = (ste->ste_child_free ?
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	482 "contains a nested function with free variables" :
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	483 "is a nested function");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	484
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	485 switch (ste->ste_unoptimized) {
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39694 diff changeset	486 case OPT_TOPLEVEL: /* import * at top-level is fine */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	487 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	488 case OPT_IMPORT_STAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	489 PyOS_snprintf(buf, sizeof(buf),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	490 "import * is not allowed in function '%.100s' "
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	491 "because it is %s",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	492 PyString_AS_STRING(ste->ste_name), trailer);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	493 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	494 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	495
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	496 PyErr_SetString(PyExc_SyntaxError, buf);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	497 PyErr_SyntaxLocation(ste->ste_table->st_filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	498 ste->ste_opt_lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	499 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	500 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	501
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	502 /* Enter the final scope information into the st_symbols dict.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	503 *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	504 * All arguments are dicts. Modifies symbols, others are read-only.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	505 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	506 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	507 update_symbols(PyObject symbols, PyObject scope,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	508 PyObject bound, PyObject free, int classflag)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	509 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	510 PyObject name, v, u, w, *free_value = NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	511 Py_ssize_t pos = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	512
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	513 while (PyDict_Next(symbols, &pos, &name, &v)) {
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	514 long i, flags;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	515 assert(PyInt_Check(v));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	516 flags = PyInt_AS_LONG(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	517 w = PyDict_GetItem(scope, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	518 assert(w && PyInt_Check(w));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	519 i = PyInt_AS_LONG(w);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	520 flags \|= (i << SCOPE_OFF);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	521 u = PyInt_FromLong(flags);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	522 if (!u)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	523 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	524 if (PyDict_SetItem(symbols, name, u) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	525 Py_DECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	526 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	527 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	528 Py_DECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	529 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	530
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	531 free_value = PyInt_FromLong(FREE << SCOPE_OFF);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	532 if (!free_value)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	533 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	534
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	535 /* add a free variable when it's only use is for creating a closure */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	536 pos = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	537 while (PyDict_Next(free, &pos, &name, &v)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	538 PyObject *o = PyDict_GetItem(symbols, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	539
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	540 if (o) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	541 /* It could be a free variable in a method of
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	542 the class that has the same name as a local
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	543 or global in the class scope.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	544 */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	545 if (classflag &&
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	546 PyInt_AS_LONG(o) & (DEF_BOUND \| DEF_GLOBAL)) {
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	547 long i = PyInt_AS_LONG(o) \| DEF_FREE_CLASS;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	548 o = PyInt_FromLong(i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	549 if (!o) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	550 Py_DECREF(free_value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	551 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	552 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	553 if (PyDict_SetItem(symbols, name, o) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	554 Py_DECREF(o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	555 Py_DECREF(free_value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	556 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	557 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	558 Py_DECREF(o);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	559 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	560 /* else it's not free, probably a cell */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	561 continue;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	562 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	563 if (!PyDict_GetItem(bound, name))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	564 continue; /* it's a global */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	565
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	566 if (PyDict_SetItem(symbols, name, free_value) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	567 Py_DECREF(free_value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	568 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	569 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	570 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	571 Py_DECREF(free_value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	572 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	573 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	574
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	575 /* Make final symbol table decisions for block of ste.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	576 Arguments:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	577 ste -- current symtable entry (input/output)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	578 bound -- set of variables bound in enclosing scopes (input)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	579 free -- set of free variables in enclosed scopes (output)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	580 globals -- set of declared global variables in enclosing scopes (input)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	581 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	582
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	583 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	584 analyze_block(PySTEntryObject ste, PyObject bound, PyObject *free,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	585 PyObject *global)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	586 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	587 PyObject name, v, local = NULL, scope = NULL, *newbound = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	588 PyObject newglobal = NULL, newfree = NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	589 int i, success = 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	590 Py_ssize_t pos = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	591
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	592 local = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	593 if (!local)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	594 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	595 scope = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	596 if (!scope)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	597 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	598 newglobal = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	599 if (!newglobal)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	600 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	601 newfree = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	602 if (!newfree)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	603 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	604 newbound = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	605 if (!newbound)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	606 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	607
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	608 if (ste->ste_type == ClassBlock) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	609 /* make a copy of globals before calling analyze_name(),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	610 because global statements in the class have no effect
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	611 on nested functions.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	612 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	613 if (PyDict_Update(newglobal, global) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	614 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	615 if (bound)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	616 if (PyDict_Update(newbound, bound) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	617 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	618 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	619
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	620 assert(PySTEntry_Check(ste));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	621 assert(PyDict_Check(ste->ste_symbols));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	622 while (PyDict_Next(ste->ste_symbols, &pos, &name, &v)) {
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	623 long flags = PyInt_AS_LONG(v);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	624 if (!analyze_name(ste, scope, name, flags, bound, local, free,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	625 global))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	626 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	627 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	628
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	629 if (ste->ste_type != ClassBlock) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	630 if (ste->ste_type == FunctionBlock) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	631 if (PyDict_Update(newbound, local) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	632 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	633 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	634 if (bound) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	635 if (PyDict_Update(newbound, bound) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	636 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	637 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	638 if (PyDict_Update(newglobal, global) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	639 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	640 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	641
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	642 /* Recursively call analyze_block() on each child block */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	643 for (i = 0; i < PyList_GET_SIZE(ste->ste_children); ++i) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	644 PyObject *c = PyList_GET_ITEM(ste->ste_children, i);
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	645 PySTEntryObject* entry;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	646 assert(c && PySTEntry_Check(c));
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	647 entry = (PySTEntryObject*)c;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	648 if (!analyze_block(entry, newbound, newfree, newglobal))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	649 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	650 if (entry->ste_free \|\| entry->ste_child_free)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	651 ste->ste_child_free = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	652 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	653
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	654 if (ste->ste_type == FunctionBlock && !analyze_cells(scope, newfree))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	655 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	656 if (!update_symbols(ste->ste_symbols, scope, bound, newfree,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	657 ste->ste_type == ClassBlock))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	658 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	659 if (!check_unoptimized(ste))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	660 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	661
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	662 if (PyDict_Update(free, newfree) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	663 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	664 success = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	665 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	666 Py_XDECREF(local);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	667 Py_XDECREF(scope);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	668 Py_XDECREF(newbound);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	669 Py_XDECREF(newglobal);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	670 Py_XDECREF(newfree);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	671 if (!success)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	672 assert(PyErr_Occurred());
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	673 return success;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	674 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	675
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	676 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	677 symtable_analyze(struct symtable *st)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	678 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	679 PyObject free, global;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	680 int r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	681
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	682 free = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	683 if (!free)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	684 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	685 global = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	686 if (!global) {
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	687 Py_DECREF(free);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	688 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	689 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	690 r = analyze_block(st->st_top, NULL, free, global);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	691 Py_DECREF(free);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	692 Py_DECREF(global);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	693 return r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	694 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	695
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	696
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	697 static int
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	698 symtable_warn(struct symtable st, char msg, int lineno)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	699 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	700 if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, st->st_filename,
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	701 lineno, NULL, NULL) < 0) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	702 if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	703 PyErr_SetString(PyExc_SyntaxError, msg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	704 PyErr_SyntaxLocation(st->st_filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	705 st->st_cur->ste_lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	706 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	707 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	708 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	709 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	710 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	711
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	712 /* symtable_enter_block() gets a reference via PySTEntry_New().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	713 This reference is released when the block is exited, via the DECREF
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	714 in symtable_exit_block().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	715 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	716
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	717 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	718 symtable_exit_block(struct symtable st, void ast)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	719 {
36521 30aef3ce2b26 Use Py_ssize_t to count the Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	720 Py_ssize_t end;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	721
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	722 Py_CLEAR(st->st_cur);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	723 end = PyList_GET_SIZE(st->st_stack) - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	724 if (end >= 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	725 st->st_cur = (PySTEntryObject *)PyList_GET_ITEM(st->st_stack,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	726 end);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	727 if (st->st_cur == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	728 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	729 Py_INCREF(st->st_cur);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	730 if (PySequence_DelItem(st->st_stack, end) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	731 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	732 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	733 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	734 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	735
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	736 static int
35793 914ec0afa51c Do not pollute name block_ty, prefix with _Py_ Neal Norwitz <nnorwitz@gmail.com> parents: 35780 diff changeset	737 symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	738 void *ast, int lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	739 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	740 PySTEntryObject *prev = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	741
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	742 if (st->st_cur) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	743 prev = st->st_cur;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	744 if (PyList_Append(st->st_stack, (PyObject *)st->st_cur) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	745 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	746 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	747 Py_DECREF(st->st_cur);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	748 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	749 st->st_cur = PySTEntry_New(st, name, block, ast, lineno);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	750 if (st->st_cur == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	751 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	752 if (name == GET_IDENTIFIER(top))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	753 st->st_global = st->st_cur->ste_symbols;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	754 if (prev) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	755 if (PyList_Append(prev->ste_children,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	756 (PyObject *)st->st_cur) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	757 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	758 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	759 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	760 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	761 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	762
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	763 static long
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	764 symtable_lookup(struct symtable st, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	765 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	766 PyObject *o;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	767 PyObject *mangled = _Py_Mangle(st->st_private, name);
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	768 if (!mangled)
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	769 return 0;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	770 o = PyDict_GetItem(st->st_cur->ste_symbols, mangled);
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	771 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	772 if (!o)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	773 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	774 return PyInt_AsLong(o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	775 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	776
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	777 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	778 symtable_add_def(struct symtable st, PyObject name, int flag)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	779 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	780 PyObject *o;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	781 PyObject *dict;
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	782 long val;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	783 PyObject *mangled = _Py_Mangle(st->st_private, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	784
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	785 if (!mangled)
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	786 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	787 dict = st->st_cur->ste_symbols;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	788 if ((o = PyDict_GetItem(dict, mangled))) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	789 val = PyInt_AS_LONG(o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	790 if ((flag & DEF_PARAM) && (val & DEF_PARAM)) {
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	791 /* Is it better to use 'mangled' or 'name' here? */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	792 PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	793 PyString_AsString(name));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	794 PyErr_SyntaxLocation(st->st_filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	795 st->st_cur->ste_lineno);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	796 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	797 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	798 val \|= flag;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	799 } else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	800 val = flag;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	801 o = PyInt_FromLong(val);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	802 if (o == NULL)
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	803 goto error;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	804 if (PyDict_SetItem(dict, mangled, o) < 0) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	805 Py_DECREF(o);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	806 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	807 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	808 Py_DECREF(o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	809
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	810 if (flag & DEF_PARAM) {
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	811 if (PyList_Append(st->st_cur->ste_varnames, mangled) < 0)
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	812 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	813 } else if (flag & DEF_GLOBAL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	814 /* XXX need to update DEF_GLOBAL for other flags too;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	815 perhaps only DEF_FREE_GLOBAL */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	816 val = flag;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	817 if ((o = PyDict_GetItem(st->st_global, mangled))) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	818 val \|= PyInt_AS_LONG(o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	819 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	820 o = PyInt_FromLong(val);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	821 if (o == NULL)
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	822 goto error;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	823 if (PyDict_SetItem(st->st_global, mangled, o) < 0) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	824 Py_DECREF(o);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	825 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	826 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	827 Py_DECREF(o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	828 }
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35880 diff changeset	829 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	830 return 1;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	831
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	832 error:
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	833 Py_DECREF(mangled);
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	834 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	835 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	836
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	837 /* VISIT, VISIT_SEQ and VIST_SEQ_TAIL take an ASDL type as their second argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	838 They use the ASDL name to synthesize the name of the C type and the visit
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	839 function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	840
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	841 VISIT_SEQ_TAIL permits the start of an ASDL sequence to be skipped, which is
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	842 useful if the first node in the sequence requires special treatment.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	843 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	844
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	845 #define VISIT(ST, TYPE, V) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	846 if (!symtable_visit_ ## TYPE((ST), (V))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	847 return 0;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	848
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	849 #define VISIT_IN_BLOCK(ST, TYPE, V, S) \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	850 if (!symtable_visit_ ## TYPE((ST), (V))) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	851 symtable_exit_block((ST), (S)); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	852 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	853 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	854
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	855 #define VISIT_SEQ(ST, TYPE, SEQ) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	856 int i; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	857 asdl_seq seq = (SEQ); / avoid variable capture */ \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	858 for (i = 0; i < asdl_seq_LEN(seq); i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	859 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	860 if (!symtable_visit_ ## TYPE((ST), elt)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	861 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	862 } \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	863 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	864
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	865 #define VISIT_SEQ_IN_BLOCK(ST, TYPE, SEQ, S) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	866 int i; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	867 asdl_seq seq = (SEQ); / avoid variable capture */ \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	868 for (i = 0; i < asdl_seq_LEN(seq); i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	869 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	870 if (!symtable_visit_ ## TYPE((ST), elt)) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	871 symtable_exit_block((ST), (S)); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	872 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	873 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	874 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	875 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	876
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	877 #define VISIT_SEQ_TAIL(ST, TYPE, SEQ, START) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	878 int i; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	879 asdl_seq seq = (SEQ); / avoid variable capture */ \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	880 for (i = (START); i < asdl_seq_LEN(seq); i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	881 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	882 if (!symtable_visit_ ## TYPE((ST), elt)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	883 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	884 } \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	885 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	886
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	887 #define VISIT_SEQ_TAIL_IN_BLOCK(ST, TYPE, SEQ, START, S) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	888 int i; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	889 asdl_seq seq = (SEQ); / avoid variable capture */ \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	890 for (i = (START); i < asdl_seq_LEN(seq); i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	891 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	892 if (!symtable_visit_ ## TYPE((ST), elt)) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	893 symtable_exit_block((ST), (S)); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	894 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	895 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	896 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	897 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	898
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	899 #define VISIT_KWONLYDEFAULTS(ST, KW_DEFAULTS) { \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	900 int i = 0; \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	901 asdl_seq seq = (KW_DEFAULTS); / avoid variable capture */ \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	902 for (i = 0; i < asdl_seq_LEN(seq); i++) { \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	903 expr_ty elt = (expr_ty)asdl_seq_GET(seq, i); \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	904 if (!elt) continue; /* can be NULL */ \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	905 if (!symtable_visit_expr((ST), elt)) \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	906 return 0; \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	907 } \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	908 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	909
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	910 static int
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	911 symtable_new_tmpname(struct symtable *st)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	912 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	913 char tmpname[256];
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	914 identifier tmp;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	915
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	916 PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]",
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	917 ++st->st_cur->ste_tmpname);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	918 tmp = PyString_InternFromString(tmpname);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	919 if (!tmp)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	920 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	921 if (!symtable_add_def(st, tmp, DEF_LOCAL))
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	922 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	923 Py_DECREF(tmp);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	924 return 1;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	925 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	926
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	927
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	928
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	929 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	930 symtable_visit_stmt(struct symtable *st, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	931 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	932 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	933 case FunctionDef_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	934 if (!symtable_add_def(st, s->v.FunctionDef.name, DEF_LOCAL))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	935 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	936 if (s->v.FunctionDef.args->defaults)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	937 VISIT_SEQ(st, expr, s->v.FunctionDef.args->defaults);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	938 if (s->v.FunctionDef.args->kw_defaults)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	939 VISIT_KWONLYDEFAULTS(st,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	940 s->v.FunctionDef.args->kw_defaults);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	941 if (!symtable_visit_annotations(st, s))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	942 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	943 if (s->v.FunctionDef.decorators)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	944 VISIT_SEQ(st, expr, s->v.FunctionDef.decorators);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	945 if (!symtable_enter_block(st, s->v.FunctionDef.name,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	946 FunctionBlock, (void *)s, s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	947 return 0;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	948 VISIT_IN_BLOCK(st, arguments, s->v.FunctionDef.args, s);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	949 VISIT_SEQ_IN_BLOCK(st, stmt, s->v.FunctionDef.body, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	950 if (!symtable_exit_block(st, s))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	951 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	952 break;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	953 case ClassDef_kind: {
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	954 PyObject *tmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	955 if (!symtable_add_def(st, s->v.ClassDef.name, DEF_LOCAL))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	956 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	957 VISIT_SEQ(st, expr, s->v.ClassDef.bases);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	958 if (!symtable_enter_block(st, s->v.ClassDef.name, ClassBlock,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	959 (void *)s, s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	960 return 0;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	961 tmp = st->st_private;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	962 st->st_private = s->v.ClassDef.name;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	963 VISIT_SEQ_IN_BLOCK(st, stmt, s->v.ClassDef.body, s);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	964 st->st_private = tmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	965 if (!symtable_exit_block(st, s))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	966 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	967 break;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	968 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	969 case Return_kind:
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	970 if (s->v.Return.value) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	971 VISIT(st, expr, s->v.Return.value);
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	972 st->st_cur->ste_returns_value = 1;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	973 if (st->st_cur->ste_generator) {
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	974 PyErr_SetString(PyExc_SyntaxError,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	975 RETURN_VAL_IN_GENERATOR);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	976 PyErr_SyntaxLocation(st->st_filename,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	977 s->lineno);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	978 return 0;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	979 }
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	980 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	981 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	982 case Delete_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	983 VISIT_SEQ(st, expr, s->v.Delete.targets);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	984 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	985 case Assign_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	986 VISIT_SEQ(st, expr, s->v.Assign.targets);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	987 VISIT(st, expr, s->v.Assign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	988 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	989 case AugAssign_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	990 VISIT(st, expr, s->v.AugAssign.target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	991 VISIT(st, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	992 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	993 case Print_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	994 if (s->v.Print.dest)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	995 VISIT(st, expr, s->v.Print.dest);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	996 VISIT_SEQ(st, expr, s->v.Print.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	997 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	998 case For_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	999 VISIT(st, expr, s->v.For.target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1000 VISIT(st, expr, s->v.For.iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1001 VISIT_SEQ(st, stmt, s->v.For.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1002 if (s->v.For.orelse)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1003 VISIT_SEQ(st, stmt, s->v.For.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1004 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1005 case While_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1006 VISIT(st, expr, s->v.While.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1007 VISIT_SEQ(st, stmt, s->v.While.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1008 if (s->v.While.orelse)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1009 VISIT_SEQ(st, stmt, s->v.While.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1010 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1011 case If_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1012 /* XXX if 0: and lookup_yield() hacks */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1013 VISIT(st, expr, s->v.If.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1014 VISIT_SEQ(st, stmt, s->v.If.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1015 if (s->v.If.orelse)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1016 VISIT_SEQ(st, stmt, s->v.If.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1017 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1018 case Raise_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1019 if (s->v.Raise.type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1020 VISIT(st, expr, s->v.Raise.type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1021 if (s->v.Raise.inst) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1022 VISIT(st, expr, s->v.Raise.inst);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1023 if (s->v.Raise.tback)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1024 VISIT(st, expr, s->v.Raise.tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1025 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1026 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1027 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1028 case TryExcept_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1029 VISIT_SEQ(st, stmt, s->v.TryExcept.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1030 VISIT_SEQ(st, stmt, s->v.TryExcept.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1031 VISIT_SEQ(st, excepthandler, s->v.TryExcept.handlers);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1032 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1033 case TryFinally_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1034 VISIT_SEQ(st, stmt, s->v.TryFinally.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1035 VISIT_SEQ(st, stmt, s->v.TryFinally.finalbody);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1036 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1037 case Assert_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1038 VISIT(st, expr, s->v.Assert.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1039 if (s->v.Assert.msg)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1040 VISIT(st, expr, s->v.Assert.msg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1041 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1042 case Import_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1043 VISIT_SEQ(st, alias, s->v.Import.names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1044 /* XXX Don't have the lineno available inside
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1045 visit_alias */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1046 if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1047 st->st_cur->ste_opt_lineno = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1048 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1049 case ImportFrom_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1050 VISIT_SEQ(st, alias, s->v.ImportFrom.names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1051 /* XXX Don't have the lineno available inside
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1052 visit_alias */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1053 if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1054 st->st_cur->ste_opt_lineno = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1055 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1056 case Global_kind: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1057 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1058 asdl_seq *seq = s->v.Global.names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1059 for (i = 0; i < asdl_seq_LEN(seq); i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	1060 identifier name = (identifier)asdl_seq_GET(seq, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1061 char *c_name = PyString_AS_STRING(name);
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	1062 long cur = symtable_lookup(st, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1063 if (cur < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1064 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1065 if (cur & (DEF_LOCAL \| USE)) {
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1066 char buf[256];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1067 if (cur & DEF_LOCAL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1068 PyOS_snprintf(buf, sizeof(buf),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1069 GLOBAL_AFTER_ASSIGN,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1070 c_name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1071 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1072 PyOS_snprintf(buf, sizeof(buf),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1073 GLOBAL_AFTER_USE,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1074 c_name);
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	1075 if (!symtable_warn(st, buf, s->lineno))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1076 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1077 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1078 if (!symtable_add_def(st, name, DEF_GLOBAL))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1079 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1080 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1081 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1082 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1083 case Expr_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1084 VISIT(st, expr, s->v.Expr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1085 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1086 case Pass_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1087 case Break_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1088 case Continue_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1089 /* nothing to do here */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1090 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1091 case With_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1092 if (!symtable_new_tmpname(st))
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1093 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1094 VISIT(st, expr, s->v.With.context_expr);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1095 if (s->v.With.optional_vars) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1096 if (!symtable_new_tmpname(st))
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1097 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1098 VISIT(st, expr, s->v.With.optional_vars);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1099 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1100 VISIT_SEQ(st, stmt, s->v.With.body);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1101 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1102 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1103 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1104 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1105
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1106 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1107 symtable_visit_expr(struct symtable *st, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1108 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1109 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1110 case BoolOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1111 VISIT_SEQ(st, expr, e->v.BoolOp.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1112 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1113 case BinOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1114 VISIT(st, expr, e->v.BinOp.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1115 VISIT(st, expr, e->v.BinOp.right);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1116 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1117 case UnaryOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1118 VISIT(st, expr, e->v.UnaryOp.operand);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1119 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1120 case Lambda_kind: {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1121 if (!GET_IDENTIFIER(lambda) \|\|
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1122 !symtable_add_def(st, lambda, DEF_LOCAL))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1123 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1124 if (e->v.Lambda.args->defaults)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1125 VISIT_SEQ(st, expr, e->v.Lambda.args->defaults);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1126 /* XXX how to get line numbers for expressions */
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1127 if (!symtable_enter_block(st, lambda,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1128 FunctionBlock, (void *)e, 0))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1129 return 0;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1130 VISIT_IN_BLOCK(st, arguments, e->v.Lambda.args, (void*)e);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1131 VISIT_IN_BLOCK(st, expr, e->v.Lambda.body, (void*)e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1132 if (!symtable_exit_block(st, (void *)e))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1133 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1134 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1135 }
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1136 case IfExp_kind:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1137 VISIT(st, expr, e->v.IfExp.test);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1138 VISIT(st, expr, e->v.IfExp.body);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1139 VISIT(st, expr, e->v.IfExp.orelse);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1140 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1141 case Dict_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1142 VISIT_SEQ(st, expr, e->v.Dict.keys);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1143 VISIT_SEQ(st, expr, e->v.Dict.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1144 break;
39694 da3a9f402886 Fix set literals not being visited in symtable creation. Georg Brandl <georg@python.org> parents: 39678 diff changeset	1145 case Set_kind:
da3a9f402886 Fix set literals not being visited in symtable creation. Georg Brandl <georg@python.org> parents: 39678 diff changeset	1146 VISIT_SEQ(st, expr, e->v.Set.elts);
da3a9f402886 Fix set literals not being visited in symtable creation. Georg Brandl <georg@python.org> parents: 39678 diff changeset	1147 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1148 case ListComp_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1149 if (!symtable_new_tmpname(st))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1150 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1151 VISIT(st, expr, e->v.ListComp.elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1152 VISIT_SEQ(st, comprehension, e->v.ListComp.generators);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1153 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1154 case GeneratorExp_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1155 if (!symtable_visit_genexp(st, e))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1156 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1157 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1158 case Yield_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1159 if (e->v.Yield.value)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1160 VISIT(st, expr, e->v.Yield.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1161 st->st_cur->ste_generator = 1;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1162 if (st->st_cur->ste_returns_value) {
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1163 PyErr_SetString(PyExc_SyntaxError,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1164 RETURN_VAL_IN_GENERATOR);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1165 PyErr_SyntaxLocation(st->st_filename,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1166 e->lineno);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1167 return 0;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1168 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1169 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1170 case Compare_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1171 VISIT(st, expr, e->v.Compare.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1172 VISIT_SEQ(st, expr, e->v.Compare.comparators);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1173 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1174 case Call_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1175 VISIT(st, expr, e->v.Call.func);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1176 VISIT_SEQ(st, expr, e->v.Call.args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1177 VISIT_SEQ(st, keyword, e->v.Call.keywords);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1178 if (e->v.Call.starargs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1179 VISIT(st, expr, e->v.Call.starargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1180 if (e->v.Call.kwargs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1181 VISIT(st, expr, e->v.Call.kwargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1182 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1183 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1184 case Str_kind:
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1185 case Ellipsis_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1186 /* Nothing to do here. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1187 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1188 /* The following exprs can be assignment targets. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1189 case Attribute_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1190 VISIT(st, expr, e->v.Attribute.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1191 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1192 case Subscript_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1193 VISIT(st, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1194 VISIT(st, slice, e->v.Subscript.slice);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1195 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1196 case Name_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1197 if (!symtable_add_def(st, e->v.Name.id,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1198 e->v.Name.ctx == Load ? USE : DEF_LOCAL))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1199 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1200 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1201 /* child nodes of List and Tuple will have expr_context set */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1202 case List_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1203 VISIT_SEQ(st, expr, e->v.List.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1204 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1205 case Tuple_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1206 VISIT_SEQ(st, expr, e->v.Tuple.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1207 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1208 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1209 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1210 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1211
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1212 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1213 symtable_implicit_arg(struct symtable *st, int pos)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1214 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1215 PyObject *id = PyString_FromFormat(".%d", pos);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1216 if (id == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1217 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1218 if (!symtable_add_def(st, id, DEF_PARAM)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1219 Py_DECREF(id);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1220 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1221 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1222 Py_DECREF(id);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1223 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1224 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1225
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1226 static int
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1227 symtable_visit_params(struct symtable st, asdl_seq args, int toplevel,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1228 int annotations)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1229 {
36226 bb6fa4a31f15 Fix icc warnings: shadowing local variable (i) and complex is set but not used, so remove Neal Norwitz <nnorwitz@gmail.com> parents: 36089 diff changeset	1230 int i;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1231
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1232 if (!args)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1233 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1234
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1235 /* go through all the toplevel arguments first */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1236 for (i = 0; i < asdl_seq_LEN(args); i++) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1237 arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1238 if (arg->kind == SimpleArg_kind) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1239 if (!annotations) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1240 if (!symtable_add_def(st,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1241 arg->v.SimpleArg.arg,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1242 DEF_PARAM))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1243 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1244 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1245 else if (arg->v.SimpleArg.annotation)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1246 VISIT(st, expr, arg->v.SimpleArg.annotation);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1247 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1248 else if (arg->kind == NestedArgs_kind) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1249 if (toplevel && !annotations) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1250 if (!symtable_implicit_arg(st, i))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1251 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1252 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1253 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1254 else {
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35880 diff changeset	1255 PyErr_SetString(PyExc_SyntaxError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35880 diff changeset	1256 "invalid expression in parameter list");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35880 diff changeset	1257 PyErr_SyntaxLocation(st->st_filename,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35880 diff changeset	1258 st->st_cur->ste_lineno);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1259 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1260 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1261 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1262
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1263 if (!toplevel) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1264 if (!symtable_visit_params_nested(st, args, annotations))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1265 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1266 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1267
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1268 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1269 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1270
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1271 static int
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1272 symtable_visit_params_nested(struct symtable st, asdl_seq args,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1273 int annotations)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1274 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1275 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1276 for (i = 0; i < asdl_seq_LEN(args); i++) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1277 arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1278 if (arg->kind == NestedArgs_kind &&
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1279 !symtable_visit_params(st, arg->v.NestedArgs.args, 0,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1280 annotations))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1281 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1282 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1283
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1284 return 1;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1285 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1286
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1287
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1288 static int
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1289 symtable_visit_annotations(struct symtable *st, stmt_ty s)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1290 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1291 arguments_ty a = s->v.FunctionDef.args;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1292
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1293 if (a->args && !symtable_visit_params(st, a->args, 1, 1))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1294 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1295 if (a->varargannotation)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1296 VISIT(st, expr, a->varargannotation);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1297 if (a->kwargannotation)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1298 VISIT(st, expr, a->kwargannotation);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1299 if (a->kwonlyargs && !symtable_visit_params(st, a->kwonlyargs, 1, 1))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1300 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1301 if (s->v.FunctionDef.returns)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1302 VISIT(st, expr, s->v.FunctionDef.returns);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1303 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1304 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1305
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1306 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1307 symtable_visit_arguments(struct symtable *st, arguments_ty a)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1308 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1309 /* skip default arguments inside function block
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1310 XXX should ast be different?
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1311 */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1312 if (a->args && !symtable_visit_params(st, a->args, 1, 0))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1313 return 0;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1314 if (a->kwonlyargs && !symtable_visit_params(st, a->kwonlyargs, 1, 0))
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1315 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1316 if (a->vararg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1317 if (!symtable_add_def(st, a->vararg, DEF_PARAM))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1318 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1319 st->st_cur->ste_varargs = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1320 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1321 if (a->kwarg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1322 if (!symtable_add_def(st, a->kwarg, DEF_PARAM))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1323 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1324 st->st_cur->ste_varkeywords = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1325 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1326 if (a->args && !symtable_visit_params_nested(st, a->args, 0))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1327 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1328 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1329 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1330
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1331
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1332 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1333 symtable_visit_excepthandler(struct symtable *st, excepthandler_ty eh)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1334 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1335 if (eh->type)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1336 VISIT(st, expr, eh->type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1337 if (eh->name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1338 VISIT(st, expr, eh->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1339 VISIT_SEQ(st, stmt, eh->body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1340 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1341 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1342
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1343
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1344 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1345 symtable_visit_alias(struct symtable *st, alias_ty a)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1346 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1347 /* Compute store_name, the name actually bound by the import
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1348 operation. It is diferent than a->name when a->name is a
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1349 dotted package name (e.g. spam.eggs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1350 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1351 PyObject *store_name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1352 PyObject *name = (a->asname == NULL) ? a->name : a->asname;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1353 const char *base = PyString_AS_STRING(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1354 char *dot = strchr(base, '.');
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1355 if (dot) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1356 store_name = PyString_FromStringAndSize(base, dot - base);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1357 if (!store_name)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1358 return 0;
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1359 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1360 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1361 store_name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1362 Py_INCREF(store_name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1363 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1364 if (strcmp(PyString_AS_STRING(name), "*")) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1365 int r = symtable_add_def(st, store_name, DEF_IMPORT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1366 Py_DECREF(store_name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1367 return r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1368 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1369 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1370 if (st->st_cur->ste_type != ModuleBlock) {
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	1371 int lineno = st->st_cur->ste_lineno;
4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	1372 if (!symtable_warn(st, IMPORT_STAR_WARNING, lineno)) {
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	1373 Py_DECREF(store_name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1374 return 0;
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	1375 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1376 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1377 st->st_cur->ste_unoptimized \|= OPT_IMPORT_STAR;
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35880 diff changeset	1378 Py_DECREF(store_name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1379 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1380 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1381 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1382
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1383
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1384 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1385 symtable_visit_comprehension(struct symtable *st, comprehension_ty lc)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1386 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1387 VISIT(st, expr, lc->target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1388 VISIT(st, expr, lc->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1389 VISIT_SEQ(st, expr, lc->ifs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1390 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1391 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1392
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1393
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1394 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1395 symtable_visit_keyword(struct symtable *st, keyword_ty k)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1396 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1397 VISIT(st, expr, k->value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1398 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1399 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1400
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1401
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1402 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1403 symtable_visit_slice(struct symtable *st, slice_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1404 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1405 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1406 case Slice_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1407 if (s->v.Slice.lower)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1408 VISIT(st, expr, s->v.Slice.lower)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1409 if (s->v.Slice.upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1410 VISIT(st, expr, s->v.Slice.upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1411 if (s->v.Slice.step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1412 VISIT(st, expr, s->v.Slice.step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1413 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1414 case ExtSlice_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1415 VISIT_SEQ(st, slice, s->v.ExtSlice.dims)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1416 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1417 case Index_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1418 VISIT(st, expr, s->v.Index.value)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1419 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1420 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1421 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1422 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1423
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1424 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1425 symtable_visit_genexp(struct symtable *st, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1426 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1427 comprehension_ty outermost = ((comprehension_ty)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1428 (asdl_seq_GET(e->v.GeneratorExp.generators, 0)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1429 /* Outermost iterator is evaluated in current scope */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1430 VISIT(st, expr, outermost->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1431 /* Create generator scope for the rest */
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1432 if (!GET_IDENTIFIER(genexpr) \|\|
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1433 !symtable_enter_block(st, genexpr, FunctionBlock, (void *)e, 0)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1434 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1435 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1436 st->st_cur->ste_generator = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1437 /* Outermost iter is received as an argument */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1438 if (!symtable_implicit_arg(st, 0)) {
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1439 symtable_exit_block(st, (void *)e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1440 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1441 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1442 VISIT_IN_BLOCK(st, expr, outermost->target, (void*)e);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1443 VISIT_SEQ_IN_BLOCK(st, expr, outermost->ifs, (void*)e);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1444 VISIT_SEQ_TAIL_IN_BLOCK(st, comprehension,
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1445 e->v.GeneratorExp.generators, 1, (void*)e);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1446 VISIT_IN_BLOCK(st, expr, e->v.GeneratorExp.elt, (void*)e);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1447 return symtable_exit_block(st, (void *)e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1448 }

Mercurial > cpython-lru_cache-weakref

annotate Python/symtable.c @ 40529:54cd47788811