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

annotate Python/symtable.c @ 61465:e38335d4df91 2.6

Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........

author	Antoine Pitrou <solipsis@pitrou.net>
date	Sun, 09 May 2010 15:15:40 +0000
parents	eaebe2460377
children	b36cb4602e21

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

Mercurial > cpython-lru_cache-weakref

annotate Python/symtable.c @ 61465:e38335d4df91 2.6