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

annotate Python/symtable.c @ 58664:993f703a61ba

Merged revisions 77484,77487,77561,77570,77593,77603,77608,77667,77702-77703,77739,77858,77887,77889 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77484 | skip.montanaro | 2010-01-13 19:12:34 -0600 (Wed, 13 Jan 2010) | 4 lines Update PyEval_EvalFrame to PyEval_EvalFrameEx. This looks to have been done partially before. Also add a comment describing how this might have to work with different versions of the interpreter. ........ r77487 | ezio.melotti | 2010-01-14 05:34:10 -0600 (Thu, 14 Jan 2010) | 1 line Fixed typo ........ r77561 | georg.brandl | 2010-01-17 02:42:30 -0600 (Sun, 17 Jan 2010) | 1 line #7699: improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such. ........ r77570 | georg.brandl | 2010-01-17 06:14:42 -0600 (Sun, 17 Jan 2010) | 1 line Add note about usage of STRINGLIB_EMPTY. ........ r77593 | georg.brandl | 2010-01-17 17:33:53 -0600 (Sun, 17 Jan 2010) | 1 line Fix internal reference. ........ r77603 | benjamin.peterson | 2010-01-18 17:07:56 -0600 (Mon, 18 Jan 2010) | 8 lines data descriptors do not override the class dictionary if __get__ is not defined Adjust documentation and add a test to verify this behavior. See http://mail.python.org/pipermail/python-dev/2010-January/095637.html for discussion. ........ r77608 | gregory.p.smith | 2010-01-19 02:19:03 -0600 (Tue, 19 Jan 2010) | 6 lines Do not compile stubs for the sha2 series hashes in the openssl hashlib module when the openssl version is too old to support them. That leads both compiled code bloat and to unittests attempting to test implementations that don't exist for comparison purposes on such platforms. ........ r77667 | mark.dickinson | 2010-01-21 12:32:27 -0600 (Thu, 21 Jan 2010) | 1 line Add two more test_strtod test values. ........ r77702 | georg.brandl | 2010-01-23 02:43:31 -0600 (Sat, 23 Jan 2010) | 1 line #7762: fix refcount annotation of PyUnicode_Tailmatch(). ........ r77703 | georg.brandl | 2010-01-23 02:47:54 -0600 (Sat, 23 Jan 2010) | 1 line #7725: fix referencing issue. ........ r77739 | benjamin.peterson | 2010-01-24 21:52:52 -0600 (Sun, 24 Jan 2010) | 1 line mention from_float() in error message ........ r77858 | georg.brandl | 2010-01-30 11:57:48 -0600 (Sat, 30 Jan 2010) | 1 line #7802: fix invalid example (heh). ........ r77887 | georg.brandl | 2010-01-31 12:51:49 -0600 (Sun, 31 Jan 2010) | 5 lines Fix-up ftplib documentation: move exception descriptions to toplevel, not inside a class remove attribution in "versionadded" spell and grammar check docstring of FTP_TLS ........ r77889 | michael.foord | 2010-01-31 13:59:26 -0600 (Sun, 31 Jan 2010) | 1 line Minor modification to unittest documentation. ........

author	Benjamin Peterson <benjamin@python.org>
date	Wed, 03 Feb 2010 02:35:45 +0000
parents	18af0ce0a58b
children	cab14be0ada1

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
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	11 #define NONLOCAL_AFTER_ASSIGN \
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	12 "name '%.400s' is assigned to before nonlocal declaration"
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	13
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	14 #define GLOBAL_AFTER_USE \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	15 "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	16
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	17 #define NONLOCAL_AFTER_USE \
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	18 "name '%.400s' is used prior to nonlocal declaration"
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	19
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	20 #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	21
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	22 #define RETURN_VAL_IN_GENERATOR \
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	23 "'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	24
48725 40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	25
36739 796d150e45a9 No need to export PySTEntry_New, it is only used in symtable.c Neal Norwitz <nnorwitz@gmail.com> parents: 36695 diff changeset	26 static PySTEntryObject *
48725 40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	27 ste_new(struct symtable *st, identifier name, _Py_block_ty block,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	28 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	29 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	30 PySTEntryObject *ste = NULL;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	31 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	32
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	33 k = PyLong_FromVoidPtr(key);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	34 if (k == NULL)
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	35 goto fail;
45774 058fbfb985ae Merged revisions 61404-61407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	36 ste = PyObject_New(PySTEntryObject, &PySTEntry_Type);
058fbfb985ae Merged revisions 61404-61407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	37 if (ste == NULL)
058fbfb985ae Merged revisions 61404-61407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	38 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	39 ste->ste_table = st;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	40 ste->ste_id = k;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	41
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	42 ste->ste_name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	43 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	44
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	45 ste->ste_symbols = NULL;
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	46 ste->ste_varnames = NULL;
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	47 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	48
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	49 ste->ste_symbols = PyDict_New();
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	50 if (ste->ste_symbols == NULL)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	51 goto fail;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	52
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	53 ste->ste_varnames = PyList_New(0);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	54 if (ste->ste_varnames == NULL)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	55 goto fail;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	56
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	57 ste->ste_children = PyList_New(0);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	58 if (ste->ste_children == NULL)
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	59 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	60
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	61 ste->ste_type = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	62 ste->ste_unoptimized = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	63 ste->ste_nested = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	64 ste->ste_free = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	65 ste->ste_varargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	66 ste->ste_varkeywords = 0;
21179 485422900ef0 SF bug #488687 reported by Neal Norwitz Jeremy Hylton <jeremy@alum.mit.edu> parents: 21090 diff changeset	67 ste->ste_opt_lineno = 0;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	68 ste->ste_lineno = lineno;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	69
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	70 if (st->st_cur != NULL &&
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	71 (st->st_cur->ste_nested \|\|
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	72 st->st_cur->ste_type == FunctionBlock))
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	73 ste->ste_nested = 1;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	74 ste->ste_child_free = 0;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 16799 diff changeset	75 ste->ste_generator = 0;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	76 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	77
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	78 if (PyDict_SetItem(st->st_blocks, ste->ste_id, (PyObject *)ste) < 0)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	79 goto fail;
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16539 diff changeset	80
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	81 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	82 fail:
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	83 Py_XDECREF(ste);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	84 return NULL;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	85 }
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	86
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	87 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	88 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	89 {
42042 e0f927414dfa Simplify ste_repr(). Walter Dörwald <walter@livinglogic.de> parents: 42013 diff changeset	90 return PyUnicode_FromFormat("<symtable entry %U(%ld), line %d>",
e0f927414dfa Simplify ste_repr(). Walter Dörwald <walter@livinglogic.de> parents: 42013 diff changeset	91 ste->ste_name,
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	92 PyLong_AS_LONG(ste->ste_id), ste->ste_lineno);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	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 {
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	98 ste->ste_table = NULL;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	99 Py_XDECREF(ste->ste_id);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	100 Py_XDECREF(ste->ste_name);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	101 Py_XDECREF(ste->ste_symbols);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	102 Py_XDECREF(ste->ste_varnames);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	103 Py_XDECREF(ste->ste_children);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	104 PyObject_Del(ste);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	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[] = {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	110 {"id", T_OBJECT, OFF(ste_id), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	111 {"name", T_OBJECT, OFF(ste_name), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	112 {"symbols", T_OBJECT, OFF(ste_symbols), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	113 {"varnames", T_OBJECT, OFF(ste_varnames), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	114 {"children", T_OBJECT, OFF(ste_children), READONLY},
48725 40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	115 {"optimized",T_INT, OFF(ste_unoptimized), READONLY},
40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	116 {"nested", T_INT, OFF(ste_nested), READONLY},
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	117 {"type", T_INT, OFF(ste_type), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	118 {"lineno", T_INT, OFF(ste_lineno), READONLY},
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	119 {NULL}
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 = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42193 diff changeset	123 PyVarObject_HEAD_INIT(&PyType_Type, 0)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	124 "symtable entry",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	125 sizeof(PySTEntryObject),
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	126 0,
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	127 (destructor)ste_dealloc, /* tp_dealloc */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	128 0, /* tp_print */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	129 0, /* tp_getattr */
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	130 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48725 diff changeset	131 0, /* tp_reserved */
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	132 (reprfunc)ste_repr, /* tp_repr */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	133 0, /* tp_as_number */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	134 0, /* tp_as_sequence */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	135 0, /* tp_as_mapping */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	136 0, /* tp_hash */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	137 0, /* tp_call */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	138 0, /* tp_str */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	139 PyObject_GenericGetAttr, /* tp_getattro */
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	140 0, /* tp_setattro */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	141 0, /* tp_as_buffer */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	142 Py_TPFLAGS_DEFAULT, /* tp_flags */
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: diff changeset	143 0, /* tp_doc */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	144 0, /* tp_traverse */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	145 0, /* tp_clear */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	146 0, /* tp_richcompare */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	147 0, /* tp_weaklistoffset */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	148 0, /* tp_iter */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	149 0, /* tp_iternext */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	150 0, /* tp_methods */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	151 ste_memberlist, /* tp_members */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	152 0, /* tp_getset */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	153 0, /* tp_base */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	154 0, /* tp_dict */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	155 0, /* tp_descr_get */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	156 0, /* tp_descr_set */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	157 0, /* tp_dictoffset */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	158 0, /* tp_init */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 diff changeset	159 0, /* tp_alloc */
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18148 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);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	165 static int symtable_enter_block(struct symtable *st, identifier name,
35793 914ec0afa51c Do not pollute name block_ty, prefix with _Py_ Neal Norwitz <nnorwitz@gmail.com> parents: 35780 diff changeset	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);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	171 static int symtable_visit_listcomp(struct symtable *st, expr_ty s);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	172 static int symtable_visit_setcomp(struct symtable *st, expr_ty s);
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	173 static int symtable_visit_dictcomp(struct symtable *st, expr_ty s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	174 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	175 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	176 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	177 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	178 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	179 static int symtable_visit_slice(struct symtable *st, slice_ty);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	180 static int symtable_visit_params(struct symtable st, asdl_seq args);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	181 static int symtable_visit_argannotations(struct symtable st, asdl_seq args);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	182 static int symtable_implicit_arg(struct symtable *st, int pos);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	183 static int symtable_visit_annotations(struct symtable *st, stmt_ty s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	184
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	185
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	186 static identifier top = NULL, lambda = NULL, genexpr = NULL,
51959 d342a725b2d5 instead of hacking __locals__ in during bytecode generation, put it in the symtable Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	187 listcomp = NULL, setcomp = NULL, dictcomp = NULL,
d342a725b2d5 instead of hacking __locals__ in during bytecode generation, put it in the symtable Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	188 __class__ = NULL, __locals__ = NULL;
35742 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 #define GET_IDENTIFIER(VAR) \
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	191 ((VAR) ? (VAR) : ((VAR) = PyUnicode_InternFromString(# VAR)))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	192
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	193 #define DUPLICATE_ARGUMENT \
42801 41da49c97a59 Use unicode for error messages of duplicate args Neal Norwitz <nnorwitz@gmail.com> parents: 42455 diff changeset	194 "duplicate argument '%U' in function definition"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	195
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	196 static struct symtable *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	197 symtable_new(void)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	198 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	199 struct symtable *st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	200
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	201 st = (struct symtable *)PyMem_Malloc(sizeof(struct symtable));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	202 if (st == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	203 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	204
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	205 st->st_filename = NULL;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	206 st->st_blocks = NULL;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	207
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	208 if ((st->st_stack = PyList_New(0)) == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	209 goto fail;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	210 if ((st->st_blocks = PyDict_New()) == NULL)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	211 goto fail;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	212 st->st_cur = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	213 st->st_private = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	214 return st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	215 fail:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	216 PySymtable_Free(st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	217 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	218 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	219
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	220 struct symtable *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	221 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	222 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	223 struct symtable *st = symtable_new();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	224 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	225 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	226
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	227 if (st == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	228 return st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	229 st->st_filename = filename;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	230 st->st_future = future;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	231 /* Make the initial symbol information gathering pass */
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	232 if (!GET_IDENTIFIER(top) \|\|
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	233 !symtable_enter_block(st, top, ModuleBlock, (void *)mod, 0)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	234 PySymtable_Free(st);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	235 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	236 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	237
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	238 st->st_top = st->st_cur;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	239 st->st_cur->ste_unoptimized = OPT_TOPLEVEL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	240 switch (mod->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	241 case Module_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	242 seq = mod->v.Module.body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	243 for (i = 0; i < asdl_seq_LEN(seq); i++)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	244 if (!symtable_visit_stmt(st,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	245 (stmt_ty)asdl_seq_GET(seq, i)))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	246 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	247 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	248 case Expression_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	249 if (!symtable_visit_expr(st, mod->v.Expression.body))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	250 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	251 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	252 case Interactive_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	253 seq = mod->v.Interactive.body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	254 for (i = 0; i < asdl_seq_LEN(seq); i++)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	255 if (!symtable_visit_stmt(st,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	256 (stmt_ty)asdl_seq_GET(seq, i)))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	257 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	258 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	259 case Suite_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	260 PyErr_SetString(PyExc_RuntimeError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	261 "this compiler does not handle Suites");
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	262 goto error;
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	263 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	264 if (!symtable_exit_block(st, (void *)mod)) {
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	265 PySymtable_Free(st);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	266 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	267 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	268 /* Make the second symbol analysis pass */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	269 if (symtable_analyze(st))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	270 return st;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	271 PySymtable_Free(st);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	272 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	273 error:
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	274 (void) symtable_exit_block(st, (void *)mod);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	275 PySymtable_Free(st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	276 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	277 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	278
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	279 void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	280 PySymtable_Free(struct symtable *st)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	281 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	282 Py_XDECREF(st->st_blocks);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	283 Py_XDECREF(st->st_stack);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	284 PyMem_Free((void *)st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	285 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	286
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	287 PySTEntryObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	288 PySymtable_Lookup(struct symtable st, void key)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	289 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	290 PyObject k, v;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	291
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	292 k = PyLong_FromVoidPtr(key);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	293 if (k == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	294 return NULL;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	295 v = PyDict_GetItem(st->st_blocks, k);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	296 if (v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	297 assert(PySTEntry_Check(v));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	298 Py_INCREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	299 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	300 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	301 PyErr_SetString(PyExc_KeyError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	302 "unknown symbol table entry");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	303 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	304
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	305 Py_DECREF(k);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	306 return (PySTEntryObject *)v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	307 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	308
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	309 int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	310 PyST_GetScope(PySTEntryObject ste, PyObject name)
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 PyObject *v = PyDict_GetItem(ste->ste_symbols, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	313 if (!v)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	314 return 0;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	315 assert(PyLong_Check(v));
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	316 return (PyLong_AS_LONG(v) >> SCOPE_OFFSET) & SCOPE_MASK;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	317 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	318
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	319
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	320 /* 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	321
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	322 The next several functions are helpers for symtable_analyze(),
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	323 which determines whether a name is local, global, or free. In addition,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	324 it determines which local variables are cell variables; they provide
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	325 bindings that are used for free variables in enclosed blocks.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	326
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	327 There are also two kinds of global variables, implicit and explicit. An
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	328 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	329 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	330 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	331 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	332 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	333 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	334 is treated as a local.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	335
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	336 The symbol table requires two passes to determine the scope of each name.
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	337 The first pass collects raw facts from the AST via the symtable_visit_*
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	338 functions: the name is a parameter here, the name is used but not defined
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	339 here, etc. The second pass analyzes these facts during a pass over the
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	340 PySTEntryObjects created during pass 1.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	341
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	342 When a function is entered during the second pass, the parent passes
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	343 the set of all name bindings visible to its children. These bindings
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	344 are used to determine if non-local variables are free or implicit globals.
41508 55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	345 Names which are explicitly declared nonlocal must exist in this set of
55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	346 visible names - if they do not, a syntax error is raised. After doing
55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	347 the local analysis, it analyzes each of its child blocks using an
55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	348 updated set of name bindings.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	349
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	350 The children update the free variable set. If a local variable is added to
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	351 the free variable set by the child, the variable is marked as a cell. The
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	352 function object being defined must provide runtime storage for the variable
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	353 that may outlive the function's frame. Cell variables are removed from the
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	354 free set before the analyze function returns to its parent.
41508 55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	355
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	356 During analysis, the names are:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	357 symbols: dict mapping from symbol names to flag values (including offset scope values)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	358 scopes: dict mapping from symbol names to scope values (no offset)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	359 local: set of all symbol names local to the current scope
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	360 bound: set of all symbol names local to a containing function scope
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	361 free: set of all symbol names referenced but not bound in child scopes
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	362 global: set of all symbol names explicitly declared as global
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	363 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	364
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	365 #define SET_SCOPE(DICT, NAME, I) { \
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	366 PyObject *o = PyLong_FromLong(I); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	367 if (!o) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	368 return 0; \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	369 if (PyDict_SetItem((DICT), (NAME), o) < 0) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	370 Py_DECREF(o); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	371 return 0; \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	372 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	373 Py_DECREF(o); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	374 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	375
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	376 /* Decide on scope of name, given flags.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	377
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	378 The namespace dictionaries may be modified to record information
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	379 about the new name. For example, a new global will add an entry to
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	380 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	381 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	382
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	383 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	384 analyze_name(PySTEntryObject ste, PyObject scopes, PyObject *name, long flags,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	385 PyObject bound, PyObject local, PyObject *free,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	386 PyObject *global)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	387 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	388 if (flags & DEF_GLOBAL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	389 if (flags & DEF_PARAM) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	390 PyErr_Format(PyExc_SyntaxError,
42043 61fd5444d95f Simplify error formatting. Fix error message in Walter Dörwald <walter@livinglogic.de> parents: 42042 diff changeset	391 "name '%U' is parameter and global",
61fd5444d95f Simplify error formatting. Fix error message in Walter Dörwald <walter@livinglogic.de> parents: 42042 diff changeset	392 name);
48725 40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	393 PyErr_SyntaxLocation(ste->ste_table->st_filename,
40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	394 ste->ste_lineno);
40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	395
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	396 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	397 }
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	398 if (flags & DEF_NONLOCAL) {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	399 PyErr_Format(PyExc_SyntaxError,
42043 61fd5444d95f Simplify error formatting. Fix error message in Walter Dörwald <walter@livinglogic.de> parents: 42042 diff changeset	400 "name '%U' is nonlocal and global",
61fd5444d95f Simplify error formatting. Fix error message in Walter Dörwald <walter@livinglogic.de> parents: 42042 diff changeset	401 name);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	402 return 0;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	403 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	404 SET_SCOPE(scopes, name, GLOBAL_EXPLICIT);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	405 if (PySet_Add(global, name) < 0)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	406 return 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	407 if (bound && (PySet_Discard(bound, name) < 0))
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	408 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	409 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	410 }
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	411 if (flags & DEF_NONLOCAL) {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	412 if (flags & DEF_PARAM) {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	413 PyErr_Format(PyExc_SyntaxError,
42043 61fd5444d95f Simplify error formatting. Fix error message in Walter Dörwald <walter@livinglogic.de> parents: 42042 diff changeset	414 "name '%U' is parameter and nonlocal",
61fd5444d95f Simplify error formatting. Fix error message in Walter Dörwald <walter@livinglogic.de> parents: 42042 diff changeset	415 name);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	416 return 0;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	417 }
41508 55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	418 if (!bound) {
55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	419 PyErr_Format(PyExc_SyntaxError,
55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	420 "nonlocal declaration not allowed at module level");
55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	421 return 0;
55d761acdcbc Don't crash when nonlocal is used at module level (fixes SF#1705365) Nick Coghlan <ncoghlan@gmail.com> parents: 41464 diff changeset	422 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	423 if (!PySet_Contains(bound, name)) {
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	424 PyErr_Format(PyExc_SyntaxError,
42043 61fd5444d95f Simplify error formatting. Fix error message in Walter Dörwald <walter@livinglogic.de> parents: 42042 diff changeset	425 "no binding for nonlocal '%U' found",
61fd5444d95f Simplify error formatting. Fix error message in Walter Dörwald <walter@livinglogic.de> parents: 42042 diff changeset	426 name);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	427
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	428 return 0;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	429 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	430 SET_SCOPE(scopes, name, FREE);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	431 ste->ste_free = 1;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	432 return PySet_Add(free, name) >= 0;
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	433 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	434 if (flags & DEF_BOUND) {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	435 SET_SCOPE(scopes, name, LOCAL);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	436 if (PySet_Add(local, name) < 0)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	437 return 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	438 if (PySet_Discard(global, name) < 0)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	439 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	440 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	441 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	442 /* If an enclosing block has a binding for this name, it
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	443 is a free variable rather than a global variable.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	444 Note that having a non-NULL bound implies that the block
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	445 is nested.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	446 */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	447 if (bound && PySet_Contains(bound, name)) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	448 SET_SCOPE(scopes, name, FREE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	449 ste->ste_free = 1;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	450 return PySet_Add(free, name) >= 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	451 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	452 /* If a parent has a global statement, then call it global
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	453 explicit? It could also be global implicit.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	454 */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	455 if (global && PySet_Contains(global, name)) {
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	456 SET_SCOPE(scopes, name, GLOBAL_IMPLICIT);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	457 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	458 }
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	459 if (ste->ste_nested)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	460 ste->ste_free = 1;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	461 SET_SCOPE(scopes, name, GLOBAL_IMPLICIT);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	462 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	463 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	464
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	465 #undef SET_SCOPE
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	466
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	467 /* 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	468 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	469 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	470
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	471 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	472 That's safe because no name can be free and local in the same scope.
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	473
43708 c34720777cb6 Bug #1356: Avoid using the C99 keyword 'restrict'. Martin v. Löwis <martin@v.loewis.de> parents: 43102 diff changeset	474 The 'restricted' argument may be set to a string to restrict the analysis
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	475 to the one variable whose name equals that string (e.g. "__class__").
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	478 static int
43708 c34720777cb6 Bug #1356: Avoid using the C99 keyword 'restrict'. Martin v. Löwis <martin@v.loewis.de> parents: 43102 diff changeset	479 analyze_cells(PyObject scopes, PyObject free, const char *restricted)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	480 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	481 PyObject name, v, *v_cell;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	482 int success = 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	483 Py_ssize_t pos = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	484
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	485 v_cell = PyLong_FromLong(CELL);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	486 if (!v_cell)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	487 return 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	488 while (PyDict_Next(scopes, &pos, &name, &v)) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	489 long scope;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	490 assert(PyLong_Check(v));
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	491 scope = PyLong_AS_LONG(v);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	492 if (scope != LOCAL)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	493 continue;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	494 if (!PySet_Contains(free, name))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	495 continue;
43708 c34720777cb6 Bug #1356: Avoid using the C99 keyword 'restrict'. Martin v. Löwis <martin@v.loewis.de> parents: 43102 diff changeset	496 if (restricted != NULL &&
c34720777cb6 Bug #1356: Avoid using the C99 keyword 'restrict'. Martin v. Löwis <martin@v.loewis.de> parents: 43102 diff changeset	497 PyUnicode_CompareWithASCIIString(name, restricted))
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	498 continue;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	499 /* Replace LOCAL with CELL for this name, and remove
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	500 from free. It is safe to replace the value of name
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	501 in the dict, because it will not cause a resize.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	502 */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	503 if (PyDict_SetItem(scopes, name, v_cell) < 0)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	504 goto error;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	505 if (PySet_Discard(free, name) < 0)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	506 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	507 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	508 success = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	509 error:
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	510 Py_DECREF(v_cell);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	511 return success;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	512 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	513
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	514 /* Check for illegal statements in unoptimized namespaces */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	515 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	516 check_unoptimized(const PySTEntryObject* ste) {
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	517 const char* trailer;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	518
35780 72cb041ccde3 Fix check_unoptimized() function. The only optimized namespaces are Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35779 diff changeset	519 if (ste->ste_type != FunctionBlock \|\| !ste->ste_unoptimized
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	520 \|\| !(ste->ste_free \|\| ste->ste_child_free))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	521 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	522
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	523 trailer = (ste->ste_child_free ?
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	524 "contains a nested function with free variables" :
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	525 "is a nested function");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	526
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	527 switch (ste->ste_unoptimized) {
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39694 diff changeset	528 case OPT_TOPLEVEL: /* import * at top-level is fine */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	529 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	530 case OPT_IMPORT_STAR:
42045 171f0e073671 Fix PyErr_Format() call (missing exception class). Walter Dörwald <walter@livinglogic.de> parents: 42044 diff changeset	531 PyErr_Format(PyExc_SyntaxError,
171f0e073671 Fix PyErr_Format() call (missing exception class). Walter Dörwald <walter@livinglogic.de> parents: 42044 diff changeset	532 "import * is not allowed in function '%U' because it %s",
42044 faa626d6e675 Use PyErr_Format() directly instead of Walter Dörwald <walter@livinglogic.de> parents: 42043 diff changeset	533 ste->ste_name, trailer);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	534 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	535 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	536
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	537 PyErr_SyntaxLocation(ste->ste_table->st_filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	538 ste->ste_opt_lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	539 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	540 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	541
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	542 /* Enter the final scope information into the ste_symbols dict.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	543 *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	544 * 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	545 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	546 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	547 update_symbols(PyObject symbols, PyObject scopes,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	548 PyObject bound, PyObject free, int classflag)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	549 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	550 PyObject name = NULL, itr = NULL;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	551 PyObject v = NULL, v_scope = NULL, v_new = NULL, v_free = NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	552 Py_ssize_t pos = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	553
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	554 /* Update scope information for all symbols in this scope */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	555 while (PyDict_Next(symbols, &pos, &name, &v)) {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	556 long scope, flags;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	557 assert(PyLong_Check(v));
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	558 flags = PyLong_AS_LONG(v);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	559 v_scope = PyDict_GetItem(scopes, name);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	560 assert(v_scope && PyLong_Check(v_scope));
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	561 scope = PyLong_AS_LONG(v_scope);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	562 flags \|= (scope << SCOPE_OFFSET);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	563 v_new = PyLong_FromLong(flags);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	564 if (!v_new)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	565 return 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	566 if (PyDict_SetItem(symbols, name, v_new) < 0) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	567 Py_DECREF(v_new);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	568 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	569 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	570 Py_DECREF(v_new);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	571 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	572
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	573 /* Record not yet resolved free variables from children (if any) */
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	574 v_free = PyLong_FromLong(FREE << SCOPE_OFFSET);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	575 if (!v_free)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	576 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	577
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	578 itr = PyObject_GetIter(free);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	579 if (!itr)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	580 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	581
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	582 while ((name = PyIter_Next(itr))) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	583 v = PyDict_GetItem(symbols, name);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	584
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	585 /* Handle symbol that already exists in this scope */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	586 if (v) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	587 /* Handle a free variable in a method of
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	588 the class that has the same name as a local
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	589 or global in the class scope.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	590 */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	591 if (classflag &&
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	592 PyLong_AS_LONG(v) & (DEF_BOUND \| DEF_GLOBAL)) {
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	593 long flags = PyLong_AS_LONG(v) \| DEF_FREE_CLASS;
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	594 v_new = PyLong_FromLong(flags);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	595 if (!v_new) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	596 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	597 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	598 if (PyDict_SetItem(symbols, name, v_new) < 0) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	599 Py_DECREF(v_new);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	600 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	601 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	602 Py_DECREF(v_new);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	603 }
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	604 /* It's a cell, or already free in this scope */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	605 Py_DECREF(name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	606 continue;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	607 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	608 /* Handle global symbol */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	609 if (!PySet_Contains(bound, name)) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	610 Py_DECREF(name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	611 continue; /* it's a global */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	612 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	613 /* Propagate new free symbol up the lexical stack */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	614 if (PyDict_SetItem(symbols, name, v_free) < 0) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	615 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	616 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	617 Py_DECREF(name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	618 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	619 Py_DECREF(itr);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	620 Py_DECREF(v_free);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	621 return 1;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	622 error:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	623 Py_XDECREF(v_free);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	624 Py_XDECREF(itr);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	625 Py_XDECREF(name);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	626 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	627 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	628
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	629 /* Make final symbol table decisions for block of ste.
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	630
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	631 Arguments:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	632 ste -- current symtable entry (input/output)
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	633 bound -- set of variables bound in enclosing scopes (input). bound
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	634 is NULL for module blocks.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	635 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	636 globals -- set of declared global variables in enclosing scopes (input)
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	637
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	638 The implementation uses two mutually recursive functions,
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	639 analyze_block() and analyze_child_block(). analyze_block() is
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	640 responsible for analyzing the individual names defined in a block.
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	641 analyze_child_block() prepares temporary namespace dictionaries
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	642 used to evaluated nested blocks.
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	643
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	644 The two functions exist because a child block should see the name
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	645 bindings of its enclosing blocks, but those bindings should not
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	646 propagate back to a parent block.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	647 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	648
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	649 static int
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	650 analyze_child_block(PySTEntryObject entry, PyObject bound, PyObject *free,
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	651 PyObject global, PyObject child_free);
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	652
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	653 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	654 analyze_block(PySTEntryObject ste, PyObject bound, PyObject *free,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	655 PyObject *global)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	656 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	657 PyObject name, v, local = NULL, scopes = NULL, *newbound = NULL;
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	658 PyObject newglobal = NULL, newfree = NULL, *allfree = NULL;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	659 PyObject *temp;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	660 int i, success = 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36240 diff changeset	661 Py_ssize_t pos = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	662
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	663 local = PySet_New(NULL); /* collect new names bound in block */
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	664 if (!local)
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	665 goto error;
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	666 scopes = PyDict_New(); /* collect scopes defined for each name */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	667 if (!scopes)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	668 goto error;
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	669
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	670 /* Allocate new global and bound variable dictionaries. These
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	671 dictionaries hold the names visible in nested blocks. For
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	672 ClassBlocks, the bound and global names are initialized
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	673 before analyzing names, because class bindings aren't
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	674 visible in methods. For other blocks, they are initialized
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	675 after names are analyzed.
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	676 */
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	677
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	678 /* TODO(jhylton): Package these dicts in a struct so that we
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	679 can write reasonable helper functions?
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	680 */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	681 newglobal = PySet_New(NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	682 if (!newglobal)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	683 goto error;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	684 newfree = PySet_New(NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	685 if (!newfree)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	686 goto error;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	687 newbound = PySet_New(NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	688 if (!newbound)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	689 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	690
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	691 /* Class namespace has no effect on names visible in
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	692 nested functions, so populate the global and bound
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	693 sets to be passed to child blocks before analyzing
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	694 this one.
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	695 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	696 if (ste->ste_type == ClassBlock) {
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	697 /* Pass down known globals */
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	698 temp = PyNumber_InPlaceOr(newglobal, global);
5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	699 if (!temp)
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	700 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	701 Py_DECREF(temp);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	702 /* Pass down previously bound symbols */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	703 if (bound) {
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	704 temp = PyNumber_InPlaceOr(newbound, bound);
5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	705 if (!temp)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	706 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	707 Py_DECREF(temp);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	708 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	709 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	710
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	711 while (PyDict_Next(ste->ste_symbols, &pos, &name, &v)) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	712 long flags = PyLong_AS_LONG(v);
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	713 if (!analyze_name(ste, scopes, name, flags,
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	714 bound, local, free, global))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	715 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	716 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	717
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	718 /* Populate global and bound sets to be passed to children. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	719 if (ste->ste_type != ClassBlock) {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	720 /* Add function locals to bound set */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	721 if (ste->ste_type == FunctionBlock) {
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	722 temp = PyNumber_InPlaceOr(newbound, local);
5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	723 if (!temp)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	724 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	725 Py_DECREF(temp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	726 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	727 /* Pass down previously bound symbols */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	728 if (bound) {
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	729 temp = PyNumber_InPlaceOr(newbound, bound);
5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	730 if (!temp)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	731 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	732 Py_DECREF(temp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	733 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	734 /* Pass down known globals */
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	735 temp = PyNumber_InPlaceOr(newglobal, global);
5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	736 if (!temp)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	737 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	738 Py_DECREF(temp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	739 }
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	740 else {
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	741 /* Special-case __class__ */
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	742 if (!GET_IDENTIFIER(__class__))
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	743 goto error;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	744 assert(PySet_Contains(local, __class__) == 1);
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	745 if (PySet_Add(newbound, __class__) < 0)
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	746 goto error;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	747 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	748
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	749 /* Recursively call analyze_block() on each child block.
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	750
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	751 newbound, newglobal now contain the names visible in
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	752 nested blocks. The free variables in the children will
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	753 be collected in allfree.
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	754 */
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	755 allfree = PySet_New(NULL);
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	756 if (!allfree)
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	757 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	758 for (i = 0; i < PyList_GET_SIZE(ste->ste_children); ++i) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	759 PyObject *c = PyList_GET_ITEM(ste->ste_children, i);
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	760 PySTEntryObject* entry;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	761 assert(c && PySTEntry_Check(c));
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	762 entry = (PySTEntryObject*)c;
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	763 if (!analyze_child_block(entry, newbound, newfree, newglobal,
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	764 allfree))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	765 goto error;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	766 /* Check if any children have free variables */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	767 if (entry->ste_free \|\| entry->ste_child_free)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	768 ste->ste_child_free = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	769 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	770
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	771 temp = PyNumber_InPlaceOr(newfree, allfree);
5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	772 if (!temp)
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	773 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	774 Py_DECREF(temp);
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	775
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	776 /* Check if any local variables must be converted to cell variables */
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	777 if (ste->ste_type == FunctionBlock && !analyze_cells(scopes, newfree,
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	778 NULL))
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	779 goto error;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	780 else if (ste->ste_type == ClassBlock && !analyze_cells(scopes, newfree,
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	781 "__class__"))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	782 goto error;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	783 /* Records the results of the analysis in the symbol table entry */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	784 if (!update_symbols(ste->ste_symbols, scopes, bound, newfree,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	785 ste->ste_type == ClassBlock))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	786 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	787 if (!check_unoptimized(ste))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	788 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	789
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	790 temp = PyNumber_InPlaceOr(free, newfree);
5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	791 if (!temp)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	792 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	793 Py_DECREF(temp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	794 success = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	795 error:
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	796 Py_XDECREF(scopes);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	797 Py_XDECREF(local);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	798 Py_XDECREF(newbound);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	799 Py_XDECREF(newglobal);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	800 Py_XDECREF(newfree);
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	801 Py_XDECREF(allfree);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	802 if (!success)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	803 assert(PyErr_Occurred());
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	804 return success;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	805 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	806
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	807 static int
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	808 analyze_child_block(PySTEntryObject entry, PyObject bound, PyObject *free,
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	809 PyObject global, PyObject child_free)
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	810 {
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	811 PyObject temp_bound = NULL, temp_global = NULL, *temp_free = NULL;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	812 PyObject *temp;
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	813
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	814 /* Copy the bound and global dictionaries.
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	815
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	816 These dictionary are used by all blocks enclosed by the
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	817 current block. The analyze_block() call modifies these
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	818 dictionaries.
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	819
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	820 */
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	821 temp_bound = PySet_New(bound);
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	822 if (!temp_bound)
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	823 goto error;
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	824 temp_free = PySet_New(free);
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	825 if (!temp_free)
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	826 goto error;
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	827 temp_global = PySet_New(global);
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	828 if (!temp_global)
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	829 goto error;
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	830
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	831 if (!analyze_block(entry, temp_bound, temp_free, temp_global))
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	832 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	833 temp = PyNumber_InPlaceOr(child_free, temp_free);
5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	834 if (!temp)
52707 bc15b483d384 rewrite error handling to make sense Benjamin Peterson <benjamin@python.org> parents: 52705 diff changeset	835 goto error;
54025 5fce14e1d703 fix error handling of PyNumber_InPlaceOr #6000 Benjamin Peterson <benjamin@python.org> parents: 52708 diff changeset	836 Py_DECREF(temp);
52707 bc15b483d384 rewrite error handling to make sense Benjamin Peterson <benjamin@python.org> parents: 52705 diff changeset	837 Py_DECREF(temp_bound);
bc15b483d384 rewrite error handling to make sense Benjamin Peterson <benjamin@python.org> parents: 52705 diff changeset	838 Py_DECREF(temp_free);
bc15b483d384 rewrite error handling to make sense Benjamin Peterson <benjamin@python.org> parents: 52705 diff changeset	839 Py_DECREF(temp_global);
bc15b483d384 rewrite error handling to make sense Benjamin Peterson <benjamin@python.org> parents: 52705 diff changeset	840 return 1;
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	841 error:
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	842 Py_XDECREF(temp_bound);
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	843 Py_XDECREF(temp_free);
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	844 Py_XDECREF(temp_global);
52707 bc15b483d384 rewrite error handling to make sense Benjamin Peterson <benjamin@python.org> parents: 52705 diff changeset	845 return 0;
52528 2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	846 }
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	847
2b436310fc8b Merged revisions 70801,70809 via svnmerge from Jeremy Hylton <jeremy@alum.mit.edu> parents: 51959 diff changeset	848 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	849 symtable_analyze(struct symtable *st)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	850 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	851 PyObject free, global;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	852 int r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	853
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	854 free = PySet_New(NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	855 if (!free)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	856 return 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	857 global = PySet_New(NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	858 if (!global) {
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	859 Py_DECREF(free);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	860 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	861 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	862 r = analyze_block(st->st_top, NULL, free, global);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	863 Py_DECREF(free);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	864 Py_DECREF(global);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	865 return r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	866 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	867
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	868
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	869 static int
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	870 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	871 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	872 if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, st->st_filename,
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	873 lineno, NULL, NULL) < 0) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	874 if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	875 PyErr_SetString(PyExc_SyntaxError, msg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	876 PyErr_SyntaxLocation(st->st_filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	877 st->st_cur->ste_lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	878 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	879 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	880 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	881 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	882 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	883
48725 40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	884 /* 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	885 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	886 in symtable_exit_block().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	887 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	888
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	889 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	890 symtable_exit_block(struct symtable st, void ast)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	891 {
36521 30aef3ce2b26 Use Py_ssize_t to count the Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	892 Py_ssize_t end;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	893
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	894 Py_CLEAR(st->st_cur);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	895 end = PyList_GET_SIZE(st->st_stack) - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	896 if (end >= 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	897 st->st_cur = (PySTEntryObject *)PyList_GET_ITEM(st->st_stack,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	898 end);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	899 if (st->st_cur == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	900 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	901 Py_INCREF(st->st_cur);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	902 if (PySequence_DelItem(st->st_stack, end) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	903 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	904 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	905 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	906 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	907
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	908 static int
35793 914ec0afa51c Do not pollute name block_ty, prefix with _Py_ Neal Norwitz <nnorwitz@gmail.com> parents: 35780 diff changeset	909 symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	910 void *ast, int lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	911 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	912 PySTEntryObject *prev = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	913
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	914 if (st->st_cur) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	915 prev = st->st_cur;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	916 if (PyList_Append(st->st_stack, (PyObject *)st->st_cur) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	917 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	918 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	919 Py_DECREF(st->st_cur);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	920 }
48725 40c07a61e1c2 Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	921 st->st_cur = ste_new(st, name, block, ast, lineno);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	922 if (st->st_cur == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	923 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	924 if (name == GET_IDENTIFIER(top))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	925 st->st_global = st->st_cur->ste_symbols;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	926 if (prev) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	927 if (PyList_Append(prev->ste_children,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	928 (PyObject *)st->st_cur) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	929 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	930 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	931 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	932 return 1;
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
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	935 static long
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	936 symtable_lookup(struct symtable st, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	937 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	938 PyObject *o;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	939 PyObject *mangled = _Py_Mangle(st->st_private, name);
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	940 if (!mangled)
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	941 return 0;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	942 o = PyDict_GetItem(st->st_cur->ste_symbols, mangled);
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	943 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	944 if (!o)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	945 return 0;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	946 return PyLong_AsLong(o);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	947 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	948
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	949 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	950 symtable_add_def(struct symtable st, PyObject name, int flag)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	951 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	952 PyObject *o;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	953 PyObject *dict;
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	954 long val;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	955 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	956
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	957
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	958 if (!mangled)
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	959 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	960 dict = st->st_cur->ste_symbols;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	961 if ((o = PyDict_GetItem(dict, mangled))) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	962 val = PyLong_AS_LONG(o);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	963 if ((flag & DEF_PARAM) && (val & DEF_PARAM)) {
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	964 /* Is it better to use 'mangled' or 'name' here? */
42801 41da49c97a59 Use unicode for error messages of duplicate args Neal Norwitz <nnorwitz@gmail.com> parents: 42455 diff changeset	965 PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	966 PyErr_SyntaxLocation(st->st_filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	967 st->st_cur->ste_lineno);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	968 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	969 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	970 val \|= flag;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	971 } else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	972 val = flag;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	973 o = PyLong_FromLong(val);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	974 if (o == NULL)
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	975 goto error;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	976 if (PyDict_SetItem(dict, mangled, o) < 0) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	977 Py_DECREF(o);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	978 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	979 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	980 Py_DECREF(o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	981
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	982 if (flag & DEF_PARAM) {
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	983 if (PyList_Append(st->st_cur->ste_varnames, mangled) < 0)
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	984 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	985 } else if (flag & DEF_GLOBAL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	986 /* XXX need to update DEF_GLOBAL for other flags too;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	987 perhaps only DEF_FREE_GLOBAL */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	988 val = flag;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	989 if ((o = PyDict_GetItem(st->st_global, mangled))) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	990 val \|= PyLong_AS_LONG(o);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	991 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43708 diff changeset	992 o = PyLong_FromLong(val);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	993 if (o == NULL)
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	994 goto error;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	995 if (PyDict_SetItem(st->st_global, mangled, o) < 0) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	996 Py_DECREF(o);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	997 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	998 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	999 Py_DECREF(o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1000 }
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35880 diff changeset	1001 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1002 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	1003
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1004 error:
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1005 Py_DECREF(mangled);
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1006 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1007 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1008
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1009 /* 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	1010 They use the ASDL name to synthesize the name of the C type and the visit
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1011 function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1012
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1013 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	1014 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	1015 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1016
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1017 #define VISIT(ST, TYPE, V) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1018 if (!symtable_visit_ ## TYPE((ST), (V))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1019 return 0;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1020
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1021 #define VISIT_IN_BLOCK(ST, TYPE, V, S) \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1022 if (!symtable_visit_ ## TYPE((ST), (V))) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1023 symtable_exit_block((ST), (S)); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1024 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1025 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1026
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1027 #define VISIT_SEQ(ST, TYPE, SEQ) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1028 int i; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1029 asdl_seq seq = (SEQ); / avoid variable capture */ \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1030 for (i = 0; i < asdl_seq_LEN(seq); i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	1031 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1032 if (!symtable_visit_ ## TYPE((ST), elt)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1033 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1034 } \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1035 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1036
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1037 #define VISIT_SEQ_IN_BLOCK(ST, TYPE, SEQ, S) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1038 int i; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1039 asdl_seq seq = (SEQ); / avoid variable capture */ \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1040 for (i = 0; i < asdl_seq_LEN(seq); i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	1041 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1042 if (!symtable_visit_ ## TYPE((ST), elt)) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1043 symtable_exit_block((ST), (S)); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1044 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1045 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1046 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1047 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1048
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1049 #define VISIT_SEQ_TAIL(ST, TYPE, SEQ, START) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1050 int i; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1051 asdl_seq seq = (SEQ); / avoid variable capture */ \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1052 for (i = (START); i < asdl_seq_LEN(seq); i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	1053 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1054 if (!symtable_visit_ ## TYPE((ST), elt)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1055 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1056 } \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1057 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1058
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1059 #define VISIT_SEQ_TAIL_IN_BLOCK(ST, TYPE, SEQ, START, S) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1060 int i; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1061 asdl_seq seq = (SEQ); / avoid variable capture */ \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1062 for (i = (START); i < asdl_seq_LEN(seq); i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	1063 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1064 if (!symtable_visit_ ## TYPE((ST), elt)) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1065 symtable_exit_block((ST), (S)); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1066 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1067 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1068 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1069 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1070
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1071 #define VISIT_KWONLYDEFAULTS(ST, KW_DEFAULTS) { \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1072 int i = 0; \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1073 asdl_seq seq = (KW_DEFAULTS); / avoid variable capture */ \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1074 for (i = 0; i < asdl_seq_LEN(seq); i++) { \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1075 expr_ty elt = (expr_ty)asdl_seq_GET(seq, i); \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1076 if (!elt) continue; /* can be NULL */ \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1077 if (!symtable_visit_expr((ST), elt)) \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1078 return 0; \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1079 } \
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1080 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1081
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1082 static int
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1083 symtable_new_tmpname(struct symtable *st)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1084 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1085 char tmpname[256];
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1086 identifier tmp;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1087
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1088 PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]",
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1089 ++st->st_cur->ste_tmpname);
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	1090 tmp = PyUnicode_InternFromString(tmpname);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1091 if (!tmp)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1092 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1093 if (!symtable_add_def(st, tmp, DEF_LOCAL))
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1094 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1095 Py_DECREF(tmp);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1096 return 1;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1097 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1098
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1099
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1100 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1101 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	1102 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1103 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1104 case FunctionDef_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1105 if (!symtable_add_def(st, s->v.FunctionDef.name, DEF_LOCAL))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1106 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1107 if (s->v.FunctionDef.args->defaults)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1108 VISIT_SEQ(st, expr, s->v.FunctionDef.args->defaults);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1109 if (s->v.FunctionDef.args->kw_defaults)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1110 VISIT_KWONLYDEFAULTS(st,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1111 s->v.FunctionDef.args->kw_defaults);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1112 if (!symtable_visit_annotations(st, s))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1113 return 0;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41769 diff changeset	1114 if (s->v.FunctionDef.decorator_list)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41769 diff changeset	1115 VISIT_SEQ(st, expr, s->v.FunctionDef.decorator_list);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1116 if (!symtable_enter_block(st, s->v.FunctionDef.name,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1117 FunctionBlock, (void *)s, s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1118 return 0;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1119 VISIT_IN_BLOCK(st, arguments, s->v.FunctionDef.args, s);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1120 VISIT_SEQ_IN_BLOCK(st, stmt, s->v.FunctionDef.body, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1121 if (!symtable_exit_block(st, s))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1122 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1123 break;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1124 case ClassDef_kind: {
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1125 PyObject *tmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1126 if (!symtable_add_def(st, s->v.ClassDef.name, DEF_LOCAL))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1127 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1128 VISIT_SEQ(st, expr, s->v.ClassDef.bases);
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	1129 VISIT_SEQ(st, keyword, s->v.ClassDef.keywords);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	1130 if (s->v.ClassDef.starargs)
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	1131 VISIT(st, expr, s->v.ClassDef.starargs);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	1132 if (s->v.ClassDef.kwargs)
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	1133 VISIT(st, expr, s->v.ClassDef.kwargs);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41769 diff changeset	1134 if (s->v.ClassDef.decorator_list)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41769 diff changeset	1135 VISIT_SEQ(st, expr, s->v.ClassDef.decorator_list);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1136 if (!symtable_enter_block(st, s->v.ClassDef.name, ClassBlock,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1137 (void *)s, s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1138 return 0;
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1139 if (!GET_IDENTIFIER(__class__) \|\|
51959 d342a725b2d5 instead of hacking __locals__ in during bytecode generation, put it in the symtable Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	1140 !symtable_add_def(st, __class__, DEF_LOCAL) \|\|
d342a725b2d5 instead of hacking __locals__ in during bytecode generation, put it in the symtable Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	1141 !GET_IDENTIFIER(__locals__) \|\|
d342a725b2d5 instead of hacking __locals__ in during bytecode generation, put it in the symtable Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	1142 !symtable_add_def(st, __locals__, DEF_PARAM)) {
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1143 symtable_exit_block(st, s);
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1144 return 0;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1145 }
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1146 tmp = st->st_private;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1147 st->st_private = s->v.ClassDef.name;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1148 VISIT_SEQ_IN_BLOCK(st, stmt, s->v.ClassDef.body, s);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1149 st->st_private = tmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1150 if (!symtable_exit_block(st, s))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1151 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1152 break;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35766 diff changeset	1153 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1154 case Return_kind:
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1155 if (s->v.Return.value) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1156 VISIT(st, expr, s->v.Return.value);
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1157 st->st_cur->ste_returns_value = 1;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1158 if (st->st_cur->ste_generator) {
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1159 PyErr_SetString(PyExc_SyntaxError,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1160 RETURN_VAL_IN_GENERATOR);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1161 PyErr_SyntaxLocation(st->st_filename,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1162 s->lineno);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1163 return 0;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1164 }
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1165 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1166 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1167 case Delete_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1168 VISIT_SEQ(st, expr, s->v.Delete.targets);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1169 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1170 case Assign_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1171 VISIT_SEQ(st, expr, s->v.Assign.targets);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1172 VISIT(st, expr, s->v.Assign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1173 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1174 case AugAssign_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1175 VISIT(st, expr, s->v.AugAssign.target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1176 VISIT(st, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1177 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1178 case For_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1179 VISIT(st, expr, s->v.For.target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1180 VISIT(st, expr, s->v.For.iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1181 VISIT_SEQ(st, stmt, s->v.For.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1182 if (s->v.For.orelse)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1183 VISIT_SEQ(st, stmt, s->v.For.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1184 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1185 case While_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1186 VISIT(st, expr, s->v.While.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1187 VISIT_SEQ(st, stmt, s->v.While.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1188 if (s->v.While.orelse)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1189 VISIT_SEQ(st, stmt, s->v.While.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1190 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1191 case If_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1192 /* XXX if 0: and lookup_yield() hacks */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1193 VISIT(st, expr, s->v.If.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1194 VISIT_SEQ(st, stmt, s->v.If.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1195 if (s->v.If.orelse)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1196 VISIT_SEQ(st, stmt, s->v.If.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1197 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1198 case Raise_kind:
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42801 diff changeset	1199 if (s->v.Raise.exc) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42801 diff changeset	1200 VISIT(st, expr, s->v.Raise.exc);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42801 diff changeset	1201 if (s->v.Raise.cause) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42801 diff changeset	1202 VISIT(st, expr, s->v.Raise.cause);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42801 diff changeset	1203 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1204 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1205 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1206 case TryExcept_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1207 VISIT_SEQ(st, stmt, s->v.TryExcept.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1208 VISIT_SEQ(st, stmt, s->v.TryExcept.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1209 VISIT_SEQ(st, excepthandler, s->v.TryExcept.handlers);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1210 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1211 case TryFinally_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1212 VISIT_SEQ(st, stmt, s->v.TryFinally.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1213 VISIT_SEQ(st, stmt, s->v.TryFinally.finalbody);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1214 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1215 case Assert_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1216 VISIT(st, expr, s->v.Assert.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1217 if (s->v.Assert.msg)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1218 VISIT(st, expr, s->v.Assert.msg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1219 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1220 case Import_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1221 VISIT_SEQ(st, alias, s->v.Import.names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1222 /* XXX Don't have the lineno available inside
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1223 visit_alias */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1224 if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1225 st->st_cur->ste_opt_lineno = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1226 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1227 case ImportFrom_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1228 VISIT_SEQ(st, alias, s->v.ImportFrom.names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1229 /* XXX Don't have the lineno available inside
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1230 visit_alias */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1231 if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1232 st->st_cur->ste_opt_lineno = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1233 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1234 case Global_kind: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1235 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1236 asdl_seq *seq = s->v.Global.names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1237 for (i = 0; i < asdl_seq_LEN(seq); i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36739 diff changeset	1238 identifier name = (identifier)asdl_seq_GET(seq, i);
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 46231 diff changeset	1239 char *c_name = _PyUnicode_AsString(name);
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36226 diff changeset	1240 long cur = symtable_lookup(st, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1241 if (cur < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1242 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1243 if (cur & (DEF_LOCAL \| USE)) {
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1244 char buf[256];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1245 if (cur & DEF_LOCAL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1246 PyOS_snprintf(buf, sizeof(buf),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1247 GLOBAL_AFTER_ASSIGN,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1248 c_name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1249 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1250 PyOS_snprintf(buf, sizeof(buf),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1251 GLOBAL_AFTER_USE,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1252 c_name);
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	1253 if (!symtable_warn(st, buf, s->lineno))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1254 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1255 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1256 if (!symtable_add_def(st, name, DEF_GLOBAL))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1257 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1258 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1259 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1260 }
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1261 case Nonlocal_kind: {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1262 int i;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1263 asdl_seq *seq = s->v.Nonlocal.names;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1264 for (i = 0; i < asdl_seq_LEN(seq); i++) {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1265 identifier name = (identifier)asdl_seq_GET(seq, i);
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 46231 diff changeset	1266 char *c_name = _PyUnicode_AsString(name);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1267 long cur = symtable_lookup(st, name);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1268 if (cur < 0)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1269 return 0;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1270 if (cur & (DEF_LOCAL \| USE)) {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1271 char buf[256];
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1272 if (cur & DEF_LOCAL)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1273 PyOS_snprintf(buf, sizeof(buf),
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1274 NONLOCAL_AFTER_ASSIGN,
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1275 c_name);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1276 else
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1277 PyOS_snprintf(buf, sizeof(buf),
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1278 NONLOCAL_AFTER_USE,
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1279 c_name);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1280 if (!symtable_warn(st, buf, s->lineno))
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1281 return 0;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1282 }
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1283 if (!symtable_add_def(st, name, DEF_NONLOCAL))
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1284 return 0;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1285 }
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1286 break;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40898 diff changeset	1287 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1288 case Expr_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1289 VISIT(st, expr, s->v.Expr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1290 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1291 case Pass_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1292 case Break_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1293 case Continue_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1294 /* nothing to do here */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1295 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1296 case With_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1297 VISIT(st, expr, s->v.With.context_expr);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1298 if (s->v.With.optional_vars) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1299 VISIT(st, expr, s->v.With.optional_vars);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1300 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1301 VISIT_SEQ(st, stmt, s->v.With.body);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1302 break;
35742 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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1305 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1306
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1307 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1308 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	1309 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1310 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1311 case BoolOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1312 VISIT_SEQ(st, expr, e->v.BoolOp.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1313 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1314 case BinOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1315 VISIT(st, expr, e->v.BinOp.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1316 VISIT(st, expr, e->v.BinOp.right);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1317 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1318 case UnaryOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1319 VISIT(st, expr, e->v.UnaryOp.operand);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1320 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1321 case Lambda_kind: {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54025 diff changeset	1322 if (!GET_IDENTIFIER(lambda))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1323 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1324 if (e->v.Lambda.args->defaults)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1325 VISIT_SEQ(st, expr, e->v.Lambda.args->defaults);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1326 if (!symtable_enter_block(st, lambda,
57376 18af0ce0a58b Merged revisions 76423-76424 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	1327 FunctionBlock, (void *)e, e->lineno))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1328 return 0;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1329 VISIT_IN_BLOCK(st, arguments, e->v.Lambda.args, (void*)e);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1330 VISIT_IN_BLOCK(st, expr, e->v.Lambda.body, (void*)e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1331 if (!symtable_exit_block(st, (void *)e))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1332 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1333 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1334 }
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1335 case IfExp_kind:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1336 VISIT(st, expr, e->v.IfExp.test);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1337 VISIT(st, expr, e->v.IfExp.body);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1338 VISIT(st, expr, e->v.IfExp.orelse);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36521 diff changeset	1339 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1340 case Dict_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1341 VISIT_SEQ(st, expr, e->v.Dict.keys);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1342 VISIT_SEQ(st, expr, e->v.Dict.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1343 break;
39694 da3a9f402886 Fix set literals not being visited in symtable creation. Georg Brandl <georg@python.org> parents: 39678 diff changeset	1344 case Set_kind:
da3a9f402886 Fix set literals not being visited in symtable creation. Georg Brandl <georg@python.org> parents: 39678 diff changeset	1345 VISIT_SEQ(st, expr, e->v.Set.elts);
da3a9f402886 Fix set literals not being visited in symtable creation. Georg Brandl <georg@python.org> parents: 39678 diff changeset	1346 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1347 case GeneratorExp_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1348 if (!symtable_visit_genexp(st, e))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1349 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1350 break;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1351 case ListComp_kind:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1352 if (!symtable_visit_listcomp(st, e))
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1353 return 0;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1354 break;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1355 case SetComp_kind:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1356 if (!symtable_visit_setcomp(st, e))
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1357 return 0;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1358 break;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1359 case DictComp_kind:
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1360 if (!symtable_visit_dictcomp(st, e))
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1361 return 0;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1362 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1363 case Yield_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1364 if (e->v.Yield.value)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1365 VISIT(st, expr, e->v.Yield.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1366 st->st_cur->ste_generator = 1;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1367 if (st->st_cur->ste_returns_value) {
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1368 PyErr_SetString(PyExc_SyntaxError,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1369 RETURN_VAL_IN_GENERATOR);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1370 PyErr_SyntaxLocation(st->st_filename,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1371 e->lineno);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1372 return 0;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1373 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1374 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1375 case Compare_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1376 VISIT(st, expr, e->v.Compare.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1377 VISIT_SEQ(st, expr, e->v.Compare.comparators);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1378 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1379 case Call_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1380 VISIT(st, expr, e->v.Call.func);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1381 VISIT_SEQ(st, expr, e->v.Call.args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1382 VISIT_SEQ(st, keyword, e->v.Call.keywords);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1383 if (e->v.Call.starargs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1384 VISIT(st, expr, e->v.Call.starargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1385 if (e->v.Call.kwargs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1386 VISIT(st, expr, e->v.Call.kwargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1387 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1388 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1389 case Str_kind:
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40788 diff changeset	1390 case Bytes_kind:
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40788 diff changeset	1391 case Ellipsis_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1392 /* Nothing to do here. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1393 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1394 /* The following exprs can be assignment targets. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1395 case Attribute_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1396 VISIT(st, expr, e->v.Attribute.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1397 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1398 case Subscript_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1399 VISIT(st, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1400 VISIT(st, slice, e->v.Subscript.slice);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1401 break;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41508 diff changeset	1402 case Starred_kind:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41508 diff changeset	1403 VISIT(st, expr, e->v.Starred.value);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41508 diff changeset	1404 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1405 case Name_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1406 if (!symtable_add_def(st, e->v.Name.id,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1407 e->v.Name.ctx == Load ? USE : DEF_LOCAL))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1408 return 0;
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1409 /* Special-case super: it counts as a use of __class__ */
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1410 if (e->v.Name.ctx == Load &&
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1411 st->st_cur->ste_type == FunctionBlock &&
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1412 !PyUnicode_CompareWithASCIIString(e->v.Name.id, "super")) {
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1413 if (!GET_IDENTIFIER(__class__) \|\|
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1414 !symtable_add_def(st, __class__, USE))
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1415 return 0;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42045 diff changeset	1416 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1417 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1418 /* child nodes of List and Tuple will have expr_context set */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1419 case List_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1420 VISIT_SEQ(st, expr, e->v.List.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1421 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1422 case Tuple_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1423 VISIT_SEQ(st, expr, e->v.Tuple.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1424 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1425 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1426 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1427 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1428
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1429 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1430 symtable_implicit_arg(struct symtable *st, int pos)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1431 {
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	1432 PyObject *id = PyUnicode_FromFormat(".%d", pos);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1433 if (id == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1434 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1435 if (!symtable_add_def(st, id, DEF_PARAM)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1436 Py_DECREF(id);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1437 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1438 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1439 Py_DECREF(id);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1440 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1441 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1442
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1443 static int
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1444 symtable_visit_params(struct symtable st, asdl_seq args)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1445 {
36226 bb6fa4a31f15 Fix icc warnings: shadowing local variable (i) and complex is set but not used, so remove Neal Norwitz <nnorwitz@gmail.com> parents: 36089 diff changeset	1446 int i;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1447
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1448 if (!args)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1449 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1450
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1451 for (i = 0; i < asdl_seq_LEN(args); i++) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1452 arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1453 if (!symtable_add_def(st, arg->arg, DEF_PARAM))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1454 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1455 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1456
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1457 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1458 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1459
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1460 static int
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1461 symtable_visit_argannotations(struct symtable st, asdl_seq args)
35742 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 int i;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1464
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1465 if (!args)
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1466 return -1;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1467
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1468 for (i = 0; i < asdl_seq_LEN(args); i++) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1469 arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1470 if (arg->annotation)
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1471 VISIT(st, expr, arg->annotation);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1472 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1473
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1474 return 1;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1475 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1476
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1477 static int
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1478 symtable_visit_annotations(struct symtable *st, stmt_ty s)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1479 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1480 arguments_ty a = s->v.FunctionDef.args;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1481
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1482 if (a->args && !symtable_visit_argannotations(st, a->args))
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1483 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1484 if (a->varargannotation)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1485 VISIT(st, expr, a->varargannotation);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1486 if (a->kwargannotation)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1487 VISIT(st, expr, a->kwargannotation);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1488 if (a->kwonlyargs && !symtable_visit_argannotations(st, a->kwonlyargs))
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1489 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1490 if (s->v.FunctionDef.returns)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40215 diff changeset	1491 VISIT(st, expr, s->v.FunctionDef.returns);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1492 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1493 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1494
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1495 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1496 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	1497 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1498 /* skip default arguments inside function block
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1499 XXX should ast be different?
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1500 */
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1501 if (a->args && !symtable_visit_params(st, a->args))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1502 return 0;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1503 if (a->kwonlyargs && !symtable_visit_params(st, a->kwonlyargs))
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1504 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1505 if (a->vararg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1506 if (!symtable_add_def(st, a->vararg, DEF_PARAM))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1507 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1508 st->st_cur->ste_varargs = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1509 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1510 if (a->kwarg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1511 if (!symtable_add_def(st, a->kwarg, DEF_PARAM))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1512 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1513 st->st_cur->ste_varkeywords = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1514 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1515 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1516 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1517
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1518
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1519 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1520 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	1521 {
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 45774 diff changeset	1522 if (eh->v.ExceptHandler.type)
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 45774 diff changeset	1523 VISIT(st, expr, eh->v.ExceptHandler.type);
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 45774 diff changeset	1524 if (eh->v.ExceptHandler.name)
81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 45774 diff changeset	1525 if (!symtable_add_def(st, eh->v.ExceptHandler.name, DEF_LOCAL))
40588 4bab65fcca8e Some more changes related to the new except syntax and semantics, Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1526 return 0;
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 45774 diff changeset	1527 VISIT_SEQ(st, stmt, eh->v.ExceptHandler.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1528 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1529 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1530
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1531
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1532 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1533 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	1534 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1535 /* Compute store_name, the name actually bound by the import
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1536 operation. It is diferent than a->name when a->name is a
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1537 dotted package name (e.g. spam.eggs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1538 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1539 PyObject *store_name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1540 PyObject *name = (a->asname == NULL) ? a->name : a->asname;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	1541 const Py_UNICODE *base = PyUnicode_AS_UNICODE(name);
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	1542 Py_UNICODE *dot = Py_UNICODE_strchr(base, '.');
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1543 if (dot) {
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	1544 store_name = PyUnicode_FromUnicode(base, dot - base);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1545 if (!store_name)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1546 return 0;
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1547 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1548 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1549 store_name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1550 Py_INCREF(store_name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1551 }
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	1552 if (PyUnicode_CompareWithASCIIString(name, "*")) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1553 int r = symtable_add_def(st, store_name, DEF_IMPORT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1554 Py_DECREF(store_name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1555 return r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1556 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1557 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1558 if (st->st_cur->ste_type != ModuleBlock) {
36089 4aa01879a8f5 Bug #889500, fix line number on SyntaxWarning for global declarations. Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	1559 int lineno = st->st_cur->ste_lineno;
42455 dd74e020a132 Merged revisions 56492-56752 via svnmerge from Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1560 PyErr_SetString(PyExc_SyntaxError, IMPORT_STAR_WARNING);
dd74e020a132 Merged revisions 56492-56752 via svnmerge from Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1561 PyErr_SyntaxLocation(st->st_filename, lineno);
dd74e020a132 Merged revisions 56492-56752 via svnmerge from Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1562 Py_DECREF(store_name);
dd74e020a132 Merged revisions 56492-56752 via svnmerge from Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1563 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1564 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1565 st->st_cur->ste_unoptimized \|= OPT_IMPORT_STAR;
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35880 diff changeset	1566 Py_DECREF(store_name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1567 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1568 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1569 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1570
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1571
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1572 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1573 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	1574 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1575 VISIT(st, expr, lc->target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1576 VISIT(st, expr, lc->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1577 VISIT_SEQ(st, expr, lc->ifs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1578 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1579 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1580
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1581
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1582 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1583 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	1584 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1585 VISIT(st, expr, k->value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1586 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1587 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1588
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1589
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1590 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1591 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	1592 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1593 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1594 case Slice_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1595 if (s->v.Slice.lower)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1596 VISIT(st, expr, s->v.Slice.lower)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1597 if (s->v.Slice.upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1598 VISIT(st, expr, s->v.Slice.upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1599 if (s->v.Slice.step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1600 VISIT(st, expr, s->v.Slice.step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1601 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1602 case ExtSlice_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1603 VISIT_SEQ(st, slice, s->v.ExtSlice.dims)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1604 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1605 case Index_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1606 VISIT(st, expr, s->v.Index.value)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1607 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1608 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1609 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1610 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1611
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1612 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1613 symtable_handle_comprehension(struct symtable *st, expr_ty e,
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1614 identifier scope_name, asdl_seq *generators,
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1615 expr_ty elt, expr_ty value)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1616 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1617 int is_generator = (e->kind == GeneratorExp_kind);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1618 int needs_tmp = !is_generator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1619 comprehension_ty outermost = ((comprehension_ty)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1620 asdl_seq_GET(generators, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1621 /* Outermost iterator is evaluated in current scope */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1622 VISIT(st, expr, outermost->iter);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1623 /* Create comprehension scope for the rest */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1624 if (!scope_name \|\|
57376 18af0ce0a58b Merged revisions 76423-76424 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	1625 !symtable_enter_block(st, scope_name, FunctionBlock, (void *)e, e->lineno)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1626 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1627 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1628 st->st_cur->ste_generator = is_generator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1629 /* Outermost iter is received as an argument */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1630 if (!symtable_implicit_arg(st, 0)) {
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1631 symtable_exit_block(st, (void *)e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1632 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1633 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1634 /* Allocate temporary name if needed */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1635 if (needs_tmp && !symtable_new_tmpname(st)) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1636 symtable_exit_block(st, (void *)e);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1637 return 0;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1638 }
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1639 VISIT_IN_BLOCK(st, expr, outermost->target, (void*)e);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1640 VISIT_SEQ_IN_BLOCK(st, expr, outermost->ifs, (void*)e);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35793 diff changeset	1641 VISIT_SEQ_TAIL_IN_BLOCK(st, comprehension,
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1642 generators, 1, (void*)e);
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1643 if (value)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1644 VISIT_IN_BLOCK(st, expr, value, (void*)e);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1645 VISIT_IN_BLOCK(st, expr, elt, (void*)e);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1646 return symtable_exit_block(st, (void *)e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 32121 diff changeset	1647 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1648
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1649 static int
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1650 symtable_visit_genexp(struct symtable *st, expr_ty e)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1651 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1652 return symtable_handle_comprehension(st, e, GET_IDENTIFIER(genexpr),
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1653 e->v.GeneratorExp.generators,
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1654 e->v.GeneratorExp.elt, NULL);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1655 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1656
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1657 static int
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1658 symtable_visit_listcomp(struct symtable *st, expr_ty e)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1659 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1660 return symtable_handle_comprehension(st, e, GET_IDENTIFIER(listcomp),
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1661 e->v.ListComp.generators,
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1662 e->v.ListComp.elt, NULL);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1663 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1664
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1665 static int
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1666 symtable_visit_setcomp(struct symtable *st, expr_ty e)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1667 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1668 return symtable_handle_comprehension(st, e, GET_IDENTIFIER(setcomp),
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1669 e->v.SetComp.generators,
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1670 e->v.SetComp.elt, NULL);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1671 }
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1672
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1673 static int
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1674 symtable_visit_dictcomp(struct symtable *st, expr_ty e)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1675 {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1676 return symtable_handle_comprehension(st, e, GET_IDENTIFIER(dictcomp),
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1677 e->v.DictComp.generators,
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1678 e->v.DictComp.key,
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1679 e->v.DictComp.value);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1680 }

Mercurial > cpython-lru_cache-weakref

annotate Python/symtable.c @ 58664:993f703a61ba