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

annotate Python/compile.c @ 33166:2e8d2bdd33de legacy-trunk

This is Mark Russell's patch: [ 1009560 ] Fix @decorator evaluation order From the description: Changes in this patch: - Change Grammar/Grammar to require newlines between adjacent decorators. - Fix order of evaluation of decorators in the C (compile.c) and python (Lib/compiler/pycodegen.py) compilers - Add better order of evaluation check to test_decorators.py (test_eval_order) - Update the decorator documentation in the reference manual (improve description of evaluation order and update syntax description) and the comment: Used Brett's evaluation order (see http://mail.python.org/pipermail/python-dev/2004-August/047835.html) (I'm checking this in for Anthony who was having problems getting SF to talk to him)

author	Michael W. Hudson <mwh@python.net>
date	Tue, 17 Aug 2004 17:29:16 +0000
parents	3db9a932775e
children	5778f6331334

rev	line source
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Compile an expression node to intermediate code */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3 /* XXX TO DO:
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4 XXX add __doc__ attribute == co_doc to code object attributes?
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	5 XXX (it's currently the first item of the co_const tuple)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	6 XXX Generate simple jump for break/return outside 'try...finally'
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	7 XXX Allow 'continue' inside finally clause of try-finally
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	8 XXX New opcode for loading the initial index for a for loop
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	9 XXX other JAR tricks?
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	10 */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	11
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	12 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	13
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	14 #include "node.h"
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	15 #include "token.h"
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	16 #include "graminit.h"
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17 #include "compile.h"
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	18 #include "symtable.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	19 #include "opcode.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	20 #include "structmember.h"
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	21
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	22 #include <ctype.h>
176 229168a2fe28 Added error checking for numeric constants; added local/global variable Guido van Rossum <guido@python.org> parents: 160 diff changeset	23
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	24 /* Three symbols from graminit.h are also defined in Python.h, with
e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	25 Py_ prefixes to their names. Python.h can't include graminit.h
e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	26 (which defines too many confusing symbols), but we can check here
e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	27 that they haven't changed (which is very unlikely, but possible). */
e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	28 #if Py_single_input != single_input
5566 19d4a2874645 Indent the #error directives so a classic K&R cpp doesn't see them. Guido van Rossum <guido@python.org> parents: 5453 diff changeset	29 #error "single_input has changed -- update Py_single_input in Python.h"
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	30 #endif
e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	31 #if Py_file_input != file_input
5566 19d4a2874645 Indent the #error directives so a classic K&R cpp doesn't see them. Guido van Rossum <guido@python.org> parents: 5453 diff changeset	32 #error "file_input has changed -- update Py_file_input in Python.h"
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	33 #endif
e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	34 #if Py_eval_input != eval_input
5566 19d4a2874645 Indent the #error directives so a classic K&R cpp doesn't see them. Guido van Rossum <guido@python.org> parents: 5453 diff changeset	35 #error "eval_input has changed -- update Py_eval_input in Python.h"
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	36 #endif
e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	37
5164 8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	38 int Py_OptimizeFlag = 0;
8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	39
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	40 #define OP_DELETE 0
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	41 #define OP_ASSIGN 1
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	42 #define OP_APPLY 2
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	43
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	44 #define VAR_LOAD 0
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	45 #define VAR_STORE 1
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	46 #define VAR_DELETE 2
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	47
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	48 #define DEL_CLOSURE_ERROR \
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	49 "can not delete variable '%.400s' referenced in nested scope"
9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	50
9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	51 #define DUPLICATE_ARGUMENT \
9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	52 "duplicate argument '%s' in function definition"
9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	53
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	54 #define GLOBAL_AFTER_ASSIGN \
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	55 "name '%.400s' is assigned to before global declaration"
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	56
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	57 #define GLOBAL_AFTER_USE \
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	58 "name '%.400s' is used prior to global declaration"
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	59
30713 9c7e0227c835 Patch #792869: Clarify error message for parameters declared global, Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	60 #define PARAM_GLOBAL \
21833 070d392042e3 Fix spelling mistakes. Bugfix candidates. Neal Norwitz <nnorwitz@gmail.com> parents: 21725 diff changeset	61 "name '%.400s' is a function parameter and declared global"
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	62
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	63 #define LATE_FUTURE \
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	64 "from __future__ imports must occur at the beginning of the file"
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	65
17185 f9a30015e8b0 Make it illegal to assign to __debug__ as per Guido's request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17132 diff changeset	66 #define ASSIGN_DEBUG \
f9a30015e8b0 Make it illegal to assign to __debug__ as per Guido's request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17132 diff changeset	67 "can not assign to __debug__"
f9a30015e8b0 Make it illegal to assign to __debug__ as per Guido's request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17132 diff changeset	68
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	69 #define MANGLE_LEN 256
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	70
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	71 #define OFF(x) offsetof(PyCodeObject, x)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	72
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19915 diff changeset	73 static PyMemberDef code_memberlist[] = {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	74 {"co_argcount", T_INT, OFF(co_argcount), READONLY},
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	75 {"co_nlocals", T_INT, OFF(co_nlocals), READONLY},
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	76 {"co_stacksize",T_INT, OFF(co_stacksize), READONLY},
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	77 {"co_flags", T_INT, OFF(co_flags), READONLY},
568 92509d304e47 add READONLY to member list. Guido van Rossum <guido@python.org> parents: 544 diff changeset	78 {"co_code", T_OBJECT, OFF(co_code), READONLY},
92509d304e47 add READONLY to member list. Guido van Rossum <guido@python.org> parents: 544 diff changeset	79 {"co_consts", T_OBJECT, OFF(co_consts), READONLY},
92509d304e47 add READONLY to member list. Guido van Rossum <guido@python.org> parents: 544 diff changeset	80 {"co_names", T_OBJECT, OFF(co_names), READONLY},
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	81 {"co_varnames", T_OBJECT, OFF(co_varnames), READONLY},
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	82 {"co_freevars", T_OBJECT, OFF(co_freevars), READONLY},
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	83 {"co_cellvars", T_OBJECT, OFF(co_cellvars), READONLY},
568 92509d304e47 add READONLY to member list. Guido van Rossum <guido@python.org> parents: 544 diff changeset	84 {"co_filename", T_OBJECT, OFF(co_filename), READONLY},
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	85 {"co_name", T_OBJECT, OFF(co_name), READONLY},
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	86 {"co_firstlineno", T_INT, OFF(co_firstlineno), READONLY},
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	87 {"co_lnotab", T_OBJECT, OFF(co_lnotab), READONLY},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	88 {NULL} /* Sentinel */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	89 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	90
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	91 /* Helper for code_new: return a shallow copy of a tuple that is
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	92 guaranteed to contain exact strings, by converting string subclasses
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	93 to exact strings and complaining if a non-string is found. */
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	94 static PyObject*
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	95 validate_and_copy_tuple(PyObject *tup)
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	96 {
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	97 PyObject *newtuple;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	98 PyObject *item;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	99 int i, len;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	100
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	101 len = PyTuple_GET_SIZE(tup);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	102 newtuple = PyTuple_New(len);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	103 if (newtuple == NULL)
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	104 return NULL;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	105
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	106 for (i = 0; i < len; i++) {
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	107 item = PyTuple_GET_ITEM(tup, i);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	108 if (PyString_CheckExact(item)) {
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	109 Py_INCREF(item);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	110 }
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	111 else if (!PyString_Check(item)) {
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	112 PyErr_Format(
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	113 PyExc_TypeError,
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	114 "name tuples must contain only "
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	115 "strings, not '%.500s'",
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	116 item->ob_type->tp_name);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	117 Py_DECREF(newtuple);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	118 return NULL;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	119 }
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	120 else {
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	121 item = PyString_FromStringAndSize(
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	122 PyString_AS_STRING(item),
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	123 PyString_GET_SIZE(item));
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	124 if (item == NULL) {
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	125 Py_DECREF(newtuple);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	126 return NULL;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	127 }
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	128 }
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	129 PyTuple_SET_ITEM(newtuple, i, item);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	130 }
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	131
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	132 return newtuple;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	133 }
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	134
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	135 PyDoc_STRVAR(code_doc,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	136 "code(argcount, nlocals, stacksize, flags, codestring, constants, names,\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	137 varnames, filename, name, firstlineno, lnotab[, freevars[, cellvars]])\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	138 \n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	139 Create a code object. Not for the faint of heart.");
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	140
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	141 static PyObject *
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	142 code_new(PyTypeObject type, PyObject args, PyObject *kw)
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	143 {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	144 int argcount;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	145 int nlocals;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	146 int stacksize;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	147 int flags;
33103 6b8e499687d6 code_new(): Wouldn't compile on Windows, because of gcc'ism. Tim Peters <tim.peters@gmail.com> parents: 33100 diff changeset	148 PyObject *co = NULL;
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	149 PyObject *code;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	150 PyObject *consts;
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	151 PyObject names, ournames = NULL;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	152 PyObject varnames, ourvarnames = NULL;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	153 PyObject freevars = NULL, ourfreevars = NULL;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	154 PyObject cellvars = NULL, ourcellvars = NULL;
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	155 PyObject *filename;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	156 PyObject *name;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	157 int firstlineno;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	158 PyObject *lnotab;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	159
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	160 if (!PyArg_ParseTuple(args, "iiiiSO!O!O!SSiS\|O!O!:code",
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	161 &argcount, &nlocals, &stacksize, &flags,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	162 &code,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	163 &PyTuple_Type, &consts,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	164 &PyTuple_Type, &names,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	165 &PyTuple_Type, &varnames,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	166 &filename, &name,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	167 &firstlineno, &lnotab,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	168 &PyTuple_Type, &freevars,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	169 &PyTuple_Type, &cellvars))
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	170 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	171
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	172 if (argcount < 0) {
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	173 PyErr_SetString(
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	174 PyExc_ValueError,
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	175 "code: argcount must not be negative");
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	176 goto cleanup;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	177 }
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	178
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	179 if (nlocals < 0) {
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	180 PyErr_SetString(
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	181 PyExc_ValueError,
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	182 "code: nlocals must not be negative");
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	183 goto cleanup;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	184 }
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	185
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	186 ournames = validate_and_copy_tuple(names);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	187 if (ournames == NULL)
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	188 goto cleanup;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	189 ourvarnames = validate_and_copy_tuple(varnames);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	190 if (ourvarnames == NULL)
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	191 goto cleanup;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	192 if (freevars)
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	193 ourfreevars = validate_and_copy_tuple(freevars);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	194 else
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	195 ourfreevars = PyTuple_New(0);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	196 if (ourfreevars == NULL)
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	197 goto cleanup;
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	198 if (cellvars)
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	199 ourcellvars = validate_and_copy_tuple(cellvars);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	200 else
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	201 ourcellvars = PyTuple_New(0);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	202 if (ourcellvars == NULL)
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	203 goto cleanup;
30428 c2c10f1eb8e2 Fix leak discovered in test_new by Michael Hudson. Raymond Hettinger <python@rcn.com> parents: 30226 diff changeset	204
c2c10f1eb8e2 Fix leak discovered in test_new by Michael Hudson. Raymond Hettinger <python@rcn.com> parents: 30226 diff changeset	205 co = (PyObject *) PyCode_New(argcount, nlocals, stacksize, flags,
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	206 code, consts, ournames, ourvarnames,
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	207 ourfreevars, ourcellvars, filename,
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	208 name, firstlineno, lnotab);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	209 cleanup:
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	210 Py_XDECREF(ournames);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	211 Py_XDECREF(ourvarnames);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	212 Py_XDECREF(ourfreevars);
356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	213 Py_XDECREF(ourcellvars);
30428 c2c10f1eb8e2 Fix leak discovered in test_new by Michael Hudson. Raymond Hettinger <python@rcn.com> parents: 30226 diff changeset	214 return co;
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	215 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	216
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	217 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	218 code_dealloc(PyCodeObject *co)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	219 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	220 Py_XDECREF(co->co_code);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	221 Py_XDECREF(co->co_consts);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	222 Py_XDECREF(co->co_names);
5901 ba49a6ef7214 Plug a leak in code_dealloc() (and reordered the deallocs to match the Guido van Rossum <guido@python.org> parents: 5754 diff changeset	223 Py_XDECREF(co->co_varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	224 Py_XDECREF(co->co_freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	225 Py_XDECREF(co->co_cellvars);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	226 Py_XDECREF(co->co_filename);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	227 Py_XDECREF(co->co_name);
5901 ba49a6ef7214 Plug a leak in code_dealloc() (and reordered the deallocs to match the Guido van Rossum <guido@python.org> parents: 5754 diff changeset	228 Py_XDECREF(co->co_lnotab);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12538 diff changeset	229 PyObject_DEL(co);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	230 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	231
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	232 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	233 code_repr(PyCodeObject *co)
1029 2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	234 {
2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	235 char buf[500];
2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	236 int lineno = -1;
2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	237 char *filename = "???";
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	238 char *name = "???";
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	239
12278 647bf71912f0 Vladimir Marangozov: This fixes the line number in the string Guido van Rossum <guido@python.org> parents: 12086 diff changeset	240 if (co->co_firstlineno != 0)
647bf71912f0 Vladimir Marangozov: This fixes the line number in the string Guido van Rossum <guido@python.org> parents: 12086 diff changeset	241 lineno = co->co_firstlineno;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	242 if (co->co_filename && PyString_Check(co->co_filename))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	243 filename = PyString_AS_STRING(co->co_filename);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	244 if (co->co_name && PyString_Check(co->co_name))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	245 name = PyString_AS_STRING(co->co_name);
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	246 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	247 "<code object %.100s at %p, file \"%.300s\", line %d>",
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	248 name, co, filename, lineno);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	249 return PyString_FromString(buf);
1029 2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	250 }
2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	251
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	252 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	253 code_compare(PyCodeObject co, PyCodeObject cp)
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	254 {
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	255 int cmp;
12333 525b2358721e Patch by Vladimir Marangozov to include the function name when Guido van Rossum <guido@python.org> parents: 12278 diff changeset	256 cmp = PyObject_Compare(co->co_name, cp->co_name);
525b2358721e Patch by Vladimir Marangozov to include the function name when Guido van Rossum <guido@python.org> parents: 12278 diff changeset	257 if (cmp) return cmp;
6186 2e755d1ff661 Cprrect stuoid tyops -- was comparing variabes with themselves because Guido van Rossum <guido@python.org> parents: 5901 diff changeset	258 cmp = co->co_argcount - cp->co_argcount;
25538 2c0e0f0dca6f Clamp code objects' tp_compare result to [-1, 1]. Michael W. Hudson <mwh@python.net> parents: 25078 diff changeset	259 if (cmp) return (cmp<0)?-1:1;
6186 2e755d1ff661 Cprrect stuoid tyops -- was comparing variabes with themselves because Guido van Rossum <guido@python.org> parents: 5901 diff changeset	260 cmp = co->co_nlocals - cp->co_nlocals;
25538 2c0e0f0dca6f Clamp code objects' tp_compare result to [-1, 1]. Michael W. Hudson <mwh@python.net> parents: 25078 diff changeset	261 if (cmp) return (cmp<0)?-1:1;
6186 2e755d1ff661 Cprrect stuoid tyops -- was comparing variabes with themselves because Guido van Rossum <guido@python.org> parents: 5901 diff changeset	262 cmp = co->co_flags - cp->co_flags;
25538 2c0e0f0dca6f Clamp code objects' tp_compare result to [-1, 1]. Michael W. Hudson <mwh@python.net> parents: 25078 diff changeset	263 if (cmp) return (cmp<0)?-1:1;
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	264 cmp = PyObject_Compare(co->co_code, cp->co_code);
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	265 if (cmp) return cmp;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	266 cmp = PyObject_Compare(co->co_consts, cp->co_consts);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	267 if (cmp) return cmp;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	268 cmp = PyObject_Compare(co->co_names, cp->co_names);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	269 if (cmp) return cmp;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	270 cmp = PyObject_Compare(co->co_varnames, cp->co_varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	271 if (cmp) return cmp;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	272 cmp = PyObject_Compare(co->co_freevars, cp->co_freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	273 if (cmp) return cmp;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	274 cmp = PyObject_Compare(co->co_cellvars, cp->co_cellvars);
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	275 return cmp;
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	276 }
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	277
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	278 static long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	279 code_hash(PyCodeObject *co)
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	280 {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	281 long h, h0, h1, h2, h3, h4, h5, h6;
12333 525b2358721e Patch by Vladimir Marangozov to include the function name when Guido van Rossum <guido@python.org> parents: 12278 diff changeset	282 h0 = PyObject_Hash(co->co_name);
525b2358721e Patch by Vladimir Marangozov to include the function name when Guido van Rossum <guido@python.org> parents: 12278 diff changeset	283 if (h0 == -1) return -1;
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	284 h1 = PyObject_Hash(co->co_code);
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	285 if (h1 == -1) return -1;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	286 h2 = PyObject_Hash(co->co_consts);
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	287 if (h2 == -1) return -1;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	288 h3 = PyObject_Hash(co->co_names);
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	289 if (h3 == -1) return -1;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	290 h4 = PyObject_Hash(co->co_varnames);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	291 if (h4 == -1) return -1;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	292 h5 = PyObject_Hash(co->co_freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	293 if (h5 == -1) return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	294 h6 = PyObject_Hash(co->co_cellvars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	295 if (h6 == -1) return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	296 h = h0 ^ h1 ^ h2 ^ h3 ^ h4 ^ h5 ^ h6 ^
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	297 co->co_argcount ^ co->co_nlocals ^ co->co_flags;
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	298 if (h == -1) h = -2;
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	299 return h;
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	300 }
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	301
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	302 /* XXX code objects need to participate in GC? */
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	303
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	304 PyTypeObject PyCode_Type = {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	305 PyObject_HEAD_INIT(&PyType_Type)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	306 0,
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	307 "code",
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	308 sizeof(PyCodeObject),
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	309 0,
19915 2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	310 (destructor)code_dealloc, /* tp_dealloc */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	311 0, /* tp_print */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	312 0, /* tp_getattr */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	313 0, /* tp_setattr */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	314 (cmpfunc)code_compare, /* tp_compare */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	315 (reprfunc)code_repr, /* tp_repr */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	316 0, /* tp_as_number */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	317 0, /* tp_as_sequence */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	318 0, /* tp_as_mapping */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	319 (hashfunc)code_hash, /* tp_hash */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	320 0, /* tp_call */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	321 0, /* tp_str */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	322 PyObject_GenericGetAttr, /* tp_getattro */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	323 0, /* tp_setattro */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	324 0, /* tp_as_buffer */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	325 Py_TPFLAGS_DEFAULT, /* tp_flags */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	326 code_doc, /* tp_doc */
19915 2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	327 0, /* tp_traverse */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	328 0, /* tp_clear */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	329 0, /* tp_richcompare */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	330 0, /* tp_weaklistoffset */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	331 0, /* tp_iter */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	332 0, /* tp_iternext */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	333 0, /* tp_methods */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	334 code_memberlist, /* tp_members */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	335 0, /* tp_getset */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	336 0, /* tp_base */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	337 0, /* tp_dict */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	338 0, /* tp_descr_get */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	339 0, /* tp_descr_set */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	340 0, /* tp_dictoffset */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	341 0, /* tp_init */
2263cb43eaab Supply code objects a new-style tp_members slot and tp_getattr impl. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19793 diff changeset	342 0, /* tp_alloc */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	343 code_new, /* tp_new */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	344 };
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	345
5287 5af766a1b531 Tweaks to keep the Microsoft compiler quier. Guido van Rossum <guido@python.org> parents: 5264 diff changeset	346 #define NAME_CHARS \
5af766a1b531 Tweaks to keep the Microsoft compiler quier. Guido van Rossum <guido@python.org> parents: 5264 diff changeset	347 "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
5af766a1b531 Tweaks to keep the Microsoft compiler quier. Guido van Rossum <guido@python.org> parents: 5264 diff changeset	348
16006 51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	349 /* all_name_chars(s): true iff all chars in s are valid NAME_CHARS */
51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	350
51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	351 static int
51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	352 all_name_chars(unsigned char *s)
51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	353 {
16523 9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	354 static char ok_name_char[256];
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	355 static unsigned char name_chars = (unsigned char )NAME_CHARS;
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	356
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	357 if (ok_name_char[*name_chars] == 0) {
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	358 unsigned char *p;
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	359 for (p = name_chars; *p; p++)
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	360 ok_name_char[*p] = 1;
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	361 }
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	362 while (*s) {
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	363 if (ok_name_char[*s++] == 0)
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	364 return 0;
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	365 }
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	366 return 1;
16006 51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	367 }
51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	368
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	369 static void
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	370 intern_strings(PyObject *tuple)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	371 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	372 int i;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	373
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	374 for (i = PyTuple_GET_SIZE(tuple); --i >= 0; ) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	375 PyObject *v = PyTuple_GET_ITEM(tuple, i);
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	376 if (v == NULL \|\| !PyString_CheckExact(v)) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	377 Py_FatalError("non-string found in code slot");
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	378 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	379 PyString_InternInPlace(&PyTuple_GET_ITEM(tuple, i));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	380 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	381 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	382
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	383 #define GETARG(arr, i) ((int)((arr[i+2]<<8) + arr[i+1]))
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	384 #define UNCONDITIONAL_JUMP(op) (op==JUMP_ABSOLUTE \|\| op==JUMP_FORWARD)
28417 1a2fd109f6b6 Factored out test for absolute jumps. Raymond Hettinger <python@rcn.com> parents: 28406 diff changeset	385 #define ABSOLUTE_JUMP(op) (op==JUMP_ABSOLUTE \|\| op==CONTINUE_LOOP)
1a2fd109f6b6 Factored out test for absolute jumps. Raymond Hettinger <python@rcn.com> parents: 28406 diff changeset	386 #define GETJUMPTGT(arr, i) (GETARG(arr,i) + (ABSOLUTE_JUMP(arr[i]) ? 0 : i+3))
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	387 #define SETARG(arr, i, val) arr[i+2] = val>>8; arr[i+1] = val & 255
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	388 #define CODESIZE(op) (HAS_ARG(op) ? 3 : 1)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	389 #define ISBASICBLOCK(blocks, start, bytes) (blocks[start]==blocks[start+bytes-1])
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	390
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	391 static unsigned int *
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	392 markblocks(unsigned char *code, int len)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	393 {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	394 unsigned int blocks = PyMem_Malloc(lensizeof(int));
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	395 int i,j, opcode, oldblock, newblock, blockcnt = 0;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	396
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	397 if (blocks == NULL)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	398 return NULL;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	399 memset(blocks, 0, len*sizeof(int));
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	400 for (i=0 ; i<len ; i+=CODESIZE(opcode)) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	401 opcode = code[i];
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	402 switch (opcode) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	403 case FOR_ITER:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	404 case JUMP_FORWARD:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	405 case JUMP_IF_FALSE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	406 case JUMP_IF_TRUE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	407 case JUMP_ABSOLUTE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	408 case CONTINUE_LOOP:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	409 case SETUP_LOOP:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	410 case SETUP_EXCEPT:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	411 case SETUP_FINALLY:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	412 j = GETJUMPTGT(code, i);
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	413 oldblock = blocks[j];
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	414 newblock = ++blockcnt;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	415 for (; j<len ; j++) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	416 if (blocks[j] != (unsigned)oldblock)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	417 break;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	418 blocks[j] = newblock;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	419 }
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	420 break;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	421 }
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	422 }
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	423 return blocks;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	424 }
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	425
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	426 static PyObject *
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	427 optimize_code(PyObject code, PyObject consts, PyObject *names)
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	428 {
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	429 int i, j, codelen;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	430 int tgt, tgttgt, opcode;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	431 unsigned char *codestr;
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	432 unsigned int *blocks;
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	433 char *name;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	434
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	435 /* Make a modifiable copy of the code string */
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	436 if (!PyString_Check(code))
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	437 goto exitUnchanged;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	438 codelen = PyString_Size(code);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	439 codestr = PyMem_Malloc(codelen);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	440 if (codestr == NULL)
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	441 goto exitUnchanged;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	442 codestr = memcpy(codestr, PyString_AS_STRING(code), codelen);
32977 40c3a51cb71c SF bug #1004088: big code objects (>64K) may be optimized incorrectly Raymond Hettinger <python@rcn.com> parents: 32956 diff changeset	443
40c3a51cb71c SF bug #1004088: big code objects (>64K) may be optimized incorrectly Raymond Hettinger <python@rcn.com> parents: 32956 diff changeset	444 /* Avoid situations where jump retargeting could overflow */
40c3a51cb71c SF bug #1004088: big code objects (>64K) may be optimized incorrectly Raymond Hettinger <python@rcn.com> parents: 32956 diff changeset	445 if (codelen > 65000)
40c3a51cb71c SF bug #1004088: big code objects (>64K) may be optimized incorrectly Raymond Hettinger <python@rcn.com> parents: 32956 diff changeset	446 goto exitUnchanged;
40c3a51cb71c SF bug #1004088: big code objects (>64K) may be optimized incorrectly Raymond Hettinger <python@rcn.com> parents: 32956 diff changeset	447
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	448 blocks = markblocks(codestr, codelen);
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	449 if (blocks == NULL) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	450 PyMem_Free(codestr);
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	451 goto exitUnchanged;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	452 }
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	453 assert(PyTuple_Check(consts));
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	454
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	455 for (i=0 ; i<codelen ; i += CODESIZE(codestr[i])) {
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	456 opcode = codestr[i];
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	457 switch (opcode) {
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	458
32402 1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	459 /* Replace UNARY_NOT JUMP_IF_FALSE POP_TOP with
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	460 with JUMP_IF_TRUE POP_TOP NOP */
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	461 case UNARY_NOT:
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	462 if (codestr[i+1] != JUMP_IF_FALSE \|\|
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	463 codestr[i+4] != POP_TOP \|\|
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	464 !ISBASICBLOCK(blocks,i,5))
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	465 continue;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	466 tgt = GETJUMPTGT(codestr, (i+1));
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	467 if (codestr[tgt] != POP_TOP)
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	468 continue;
32402 1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	469 j = GETARG(codestr, i+1) + 1;
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	470 codestr[i] = JUMP_IF_TRUE;
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	471 SETARG(codestr, i, j);
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	472 codestr[i+3] = POP_TOP;
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	473 codestr[i+4] = NOP;
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	474 break;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	475
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	476 /* not a is b --> a is not b
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	477 not a in b --> a not in b
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	478 not a is not b --> a is b
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	479 not a not in b --> a in b */
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	480 case COMPARE_OP:
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	481 j = GETARG(codestr, i);
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	482 if (j < 6 \|\| j > 9 \|\|
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	483 codestr[i+3] != UNARY_NOT \|\|
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	484 !ISBASICBLOCK(blocks,i,4))
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	485 continue;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	486 SETARG(codestr, i, (j^1));
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	487 codestr[i+3] = NOP;
32717 0e890ac1c0f2 optimize_code(): Repaired gross error in new special-casing for None. Tim Peters <tim.peters@gmail.com> parents: 32711 diff changeset	488 break;
0e890ac1c0f2 optimize_code(): Repaired gross error in new special-casing for None. Tim Peters <tim.peters@gmail.com> parents: 32711 diff changeset	489
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	490 /* Replace LOAD_GLOBAL/LOAD_NAME None with LOAD_CONST None */
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	491 case LOAD_NAME:
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	492 case LOAD_GLOBAL:
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	493 j = GETARG(codestr, i);
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	494 name = PyString_AsString(PyTuple_GET_ITEM(names, j));
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	495 if (name == NULL \|\| strcmp(name, "None") != 0)
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	496 continue;
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	497 for (j=0 ; j < PyTuple_GET_SIZE(consts) ; j++) {
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	498 if (PyTuple_GET_ITEM(consts, j) == Py_None) {
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	499 codestr[i] = LOAD_CONST;
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	500 SETARG(codestr, i, j);
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	501 break;
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	502 }
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	503 }
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	504 break;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	505
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	506 /* Skip over LOAD_CONST trueconst JUMP_IF_FALSE xx POP_TOP.
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	507 Note, only the first opcode is changed, the others still
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	508 perform normally if they happen to be jump targets. */
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	509 case LOAD_CONST:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	510 j = GETARG(codestr, i);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	511 if (codestr[i+3] != JUMP_IF_FALSE \|\|
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	512 codestr[i+6] != POP_TOP \|\|
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	513 !PyObject_IsTrue(PyTuple_GET_ITEM(consts, j)))
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	514 continue;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	515 codestr[i] = JUMP_FORWARD;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	516 SETARG(codestr, i, 4);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	517 break;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	518
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	519 /* Replace BUILD_SEQN 2 UNPACK_SEQN 2 with ROT2 JMP+2 NOP NOP.
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	520 Replace BUILD_SEQN 3 UNPACK_SEQN 3 with ROT3 ROT2 JMP+1 NOP. */
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	521 case BUILD_TUPLE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	522 case BUILD_LIST:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	523 if (codestr[i+3] != UNPACK_SEQUENCE)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	524 continue;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	525 if (!ISBASICBLOCK(blocks,i,6))
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	526 continue;
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	527 if (GETARG(codestr, i) == 2 &&
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	528 GETARG(codestr, i+3) == 2) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	529 codestr[i] = ROT_TWO;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	530 codestr[i+1] = JUMP_FORWARD;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	531 SETARG(codestr, i+1, 2);
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	532 codestr[i+4] = NOP;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	533 codestr[i+5] = NOP;
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	534 continue;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	535 }
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	536 if (GETARG(codestr, i) == 3 &&
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	537 GETARG(codestr, i+3) == 3) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	538 codestr[i] = ROT_THREE;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	539 codestr[i+1] = ROT_TWO;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	540 codestr[i+2] = JUMP_FORWARD;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	541 SETARG(codestr, i+2, 1);
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	542 codestr[i+5] = NOP;
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	543 }
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	544 break;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	545
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	546 /* Replace jumps to unconditional jumps */
28610 67d36f4dfea1 Extend SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28417 diff changeset	547 case FOR_ITER:
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	548 case JUMP_FORWARD:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	549 case JUMP_IF_FALSE:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	550 case JUMP_IF_TRUE:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	551 case JUMP_ABSOLUTE:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	552 case CONTINUE_LOOP:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	553 case SETUP_LOOP:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	554 case SETUP_EXCEPT:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	555 case SETUP_FINALLY:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	556 tgt = GETJUMPTGT(codestr, i);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	557 if (!UNCONDITIONAL_JUMP(codestr[tgt]))
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	558 continue;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	559 tgttgt = GETJUMPTGT(codestr, tgt);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	560 if (opcode == JUMP_FORWARD) /* JMP_ABS can go backwards */
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	561 opcode = JUMP_ABSOLUTE;
28417 1a2fd109f6b6 Factored out test for absolute jumps. Raymond Hettinger <python@rcn.com> parents: 28406 diff changeset	562 if (!ABSOLUTE_JUMP(opcode))
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	563 tgttgt -= i + 3; /* Calc relative jump addr */
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	564 if (tgttgt < 0) /* No backward relative jumps */
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	565 continue;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	566 codestr[i] = opcode;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	567 SETARG(codestr, i, tgttgt);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	568 break;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	569
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	570 case EXTENDED_ARG:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	571 PyMem_Free(codestr);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	572 goto exitUnchanged;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	573 }
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	574 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 28955 diff changeset	575 code = PyString_FromStringAndSize((char *)codestr, codelen);
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	576 PyMem_Free(codestr);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	577 PyMem_Free(blocks);
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	578 return code;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	579
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	580 exitUnchanged:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	581 Py_INCREF(code);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	582 return code;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	583 }
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	584
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	585 PyCodeObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	586 PyCode_New(int argcount, int nlocals, int stacksize, int flags,
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	587 PyObject code, PyObject consts, PyObject *names,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	588 PyObject varnames, PyObject freevars, PyObject *cellvars,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	589 PyObject filename, PyObject name, int firstlineno,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	590 PyObject *lnotab)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	591 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	592 PyCodeObject *co;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	593 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	594 /* Check argument types */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	595 if (argcount < 0 \|\| nlocals < 0 \|\|
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	596 code == NULL \|\|
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	597 consts == NULL \|\| !PyTuple_Check(consts) \|\|
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	598 names == NULL \|\| !PyTuple_Check(names) \|\|
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	599 varnames == NULL \|\| !PyTuple_Check(varnames) \|\|
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	600 freevars == NULL \|\| !PyTuple_Check(freevars) \|\|
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	601 cellvars == NULL \|\| !PyTuple_Check(cellvars) \|\|
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	602 name == NULL \|\| !PyString_Check(name) \|\|
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	603 filename == NULL \|\| !PyString_Check(filename) \|\|
20947 c555f1e7c4be Use PyObject_CheckReadBuffer(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 20939 diff changeset	604 lnotab == NULL \|\| !PyString_Check(lnotab) \|\|
c555f1e7c4be Use PyObject_CheckReadBuffer(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 20939 diff changeset	605 !PyObject_CheckReadBuffer(code)) {
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	606 PyErr_BadInternalCall();
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	607 return NULL;
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	608 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	609 intern_strings(names);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	610 intern_strings(varnames);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	611 intern_strings(freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	612 intern_strings(cellvars);
5009 402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	613 /* Intern selected string constants */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	614 for (i = PyTuple_Size(consts); --i >= 0; ) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	615 PyObject *v = PyTuple_GetItem(consts, i);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	616 if (!PyString_Check(v))
5009 402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	617 continue;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	618 if (!all_name_chars((unsigned char *)PyString_AS_STRING(v)))
5009 402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	619 continue;
402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	620 PyString_InternInPlace(&PyTuple_GET_ITEM(consts, i));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	621 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	622 co = PyObject_NEW(PyCodeObject, &PyCode_Type);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	623 if (co != NULL) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	624 co->co_argcount = argcount;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	625 co->co_nlocals = nlocals;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	626 co->co_stacksize = stacksize;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	627 co->co_flags = flags;
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	628 co->co_code = optimize_code(code, consts, names);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	629 Py_INCREF(consts);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	630 co->co_consts = consts;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	631 Py_INCREF(names);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	632 co->co_names = names;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	633 Py_INCREF(varnames);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	634 co->co_varnames = varnames;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	635 Py_INCREF(freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	636 co->co_freevars = freevars;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	637 Py_INCREF(cellvars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	638 co->co_cellvars = cellvars;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	639 Py_INCREF(filename);
266 b5826bf29677 Changed and exported newcodeobject() interface, for ".pyc" files. Guido van Rossum <guido@python.org> parents: 238 diff changeset	640 co->co_filename = filename;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	641 Py_INCREF(name);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	642 co->co_name = name;
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	643 co->co_firstlineno = firstlineno;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	644 Py_INCREF(lnotab);
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	645 co->co_lnotab = lnotab;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27270 diff changeset	646 if (PyTuple_GET_SIZE(freevars) == 0 &&
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27270 diff changeset	647 PyTuple_GET_SIZE(cellvars) == 0)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27270 diff changeset	648 co->co_flags \|= CO_NOFREE;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	649 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	650 return co;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	651 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	652
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	653
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	654 /* Data structure used internally */
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	655
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	656 /* The compiler uses two passes to generate bytecodes. The first pass
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	657 builds the symbol table. The second pass generates the bytecode.
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	658
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	659 The first pass uses a single symtable struct. The second pass uses
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	660 a compiling struct for each code block. The compiling structs
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	661 share a reference to the symtable.
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	662
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	663 The two passes communicate via symtable_load_symbols() and via
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	664 is_local() and is_global(). The former initializes several slots
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	665 in the compiling struct: c_varnames, c_locals, c_nlocals,
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	666 c_argcount, c_globals, and c_flags.
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	667 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	668
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	669 /* All about c_lnotab.
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	670
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	671 c_lnotab is an array of unsigned bytes disguised as a Python string. Since
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	672 version 2.3, SET_LINENO opcodes are never generated and bytecode offsets are
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	673 mapped to source code line #s via c_lnotab instead.
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	674
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	675 The array is conceptually a list of
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	676 (bytecode offset increment, line number increment)
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	677 pairs. The details are important and delicate, best illustrated by example:
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	678
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	679 byte code offset source code line number
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	680 0 1
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	681 6 2
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	682 50 7
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	683 350 307
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	684 361 308
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	685
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	686 The first trick is that these numbers aren't stored, only the increments
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	687 from one row to the next (this doesn't really work, but it's a start):
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	688
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	689 0, 1, 6, 1, 44, 5, 300, 300, 11, 1
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	690
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	691 The second trick is that an unsigned byte can't hold negative values, or
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	692 values larger than 255, so (a) there's a deep assumption that byte code
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	693 offsets and their corresponding line #s both increase monotonically, and (b)
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	694 if at least one column jumps by more than 255 from one row to the next, more
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	695 than one pair is written to the table. In case #b, there's no way to know
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	696 from looking at the table later how many were written. That's the delicate
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	697 part. A user of c_lnotab desiring to find the source line number
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	698 corresponding to a bytecode address A should do something like this
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	699
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	700 lineno = addr = 0
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	701 for addr_incr, line_incr in c_lnotab:
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	702 addr += addr_incr
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	703 if addr > A:
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	704 return lineno
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	705 lineno += line_incr
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	706
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	707 In order for this to work, when the addr field increments by more than 255,
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	708 the line # increment in each pair generated must be 0 until the remaining addr
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	709 increment is < 256. So, in the example above, com_set_lineno should not (as
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	710 was actually done until 2.2) expand 300, 300 to 255, 255, 45, 45, but to
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	711 255, 0, 45, 255, 0, 45.
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	712 */
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	713
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	714 struct compiling {
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	715 PyObject c_code; / string */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	716 PyObject c_consts; / list of objects */
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	717 PyObject c_const_dict; / inverse of c_consts */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	718 PyObject c_names; / list of strings (names) */
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	719 PyObject c_name_dict; / inverse of c_names */
26701 45ab31127bf9 SF # 654960, remove unnecessary static variable Neal Norwitz <nnorwitz@gmail.com> parents: 26670 diff changeset	720 PyObject c_globals; / dictionary (value=None or True) */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	721 PyObject c_locals; / dictionary (value=localID) */
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	722 PyObject c_varnames; / list (inverse of c_locals) */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	723 PyObject c_freevars; / dictionary (value=None) */
33132 e4992e930cb2 Fix incorrect comment for (struct compiling)->c_cellvars Brett Cannon <bcannon@gmail.com> parents: 33103 diff changeset	724 PyObject c_cellvars; / dictionary */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	725 int c_nlocals; /* index of next local */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	726 int c_argcount; /* number of top-level arguments */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	727 int c_flags; /* same as co_flags */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	728 int c_nexti; /* index into c_code */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	729 int c_errors; /* counts errors occurred */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	730 int c_infunction; /* set when compiling a function */
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	731 int c_interactive; /* generating code for interactive command */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	732 int c_loops; /* counts nested loops */
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	733 int c_begin; /* begin of current loop, for 'continue' */
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	734 int c_block[CO_MAXBLOCKS]; /* stack of block types */
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	735 int c_nblocks; /* current block stack level */
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	736 const char c_filename; / filename of current node */
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	737 char c_name; / name of object (e.g. function) */
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	738 int c_lineno; /* Current line number */
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	739 int c_stacklevel; /* Current stack level */
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	740 int c_maxstacklevel; /* Maximum stack level */
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	741 int c_firstlineno;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	742 PyObject c_lnotab; / Table mapping address to line number */
31764 5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	743 int c_last_addr; /* last op addr seen and recorded in lnotab */
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	744 int c_last_line; /* last line seen and recorded in lnotab */
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	745 int c_lnotab_next; /* current length of lnotab */
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	746 int c_lnotab_last; /* start of last lnotab record added */
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	747 char c_private; / for private name mangling */
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	748 int c_tmpname; /* temporary local name counter */
16523 9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	749 int c_nested; /* Is block nested funcdef or lamdef? */
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	750 int c_closure; /* Is nested w/freevars? */
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	751 struct symtable c_symtable; / pointer to module symbol table */
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: 16783 diff changeset	752 PyFutureFeatures c_future; / pointer to module's __future__ */
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	753 char c_encoding; / source encoding (a borrowed reference) */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	754 };
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	755
17518 f939ce52a734 Make some private symbols static. Guido van Rossum <guido@python.org> parents: 17355 diff changeset	756 static int
f939ce52a734 Make some private symbols static. Guido van Rossum <guido@python.org> parents: 17355 diff changeset	757 is_free(int v)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	758 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	759 if ((v & (USE \| DEF_FREE))
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	760 && !(v & (DEF_LOCAL \| DEF_PARAM \| DEF_GLOBAL)))
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	761 return 1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	762 if (v & DEF_FREE_CLASS)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	763 return 1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	764 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	765 }
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	766
16428 6496844c4a42 Fix symbol table pass to generation SyntaxError exceptions that Jeremy Hylton <jeremy@alum.mit.edu> parents: 16421 diff changeset	767 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	768 com_error(struct compiling c, PyObject exc, char *msg)
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	769 {
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	770 PyObject t = NULL, v = NULL, w = NULL, line = NULL;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	771
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	772 if (c == NULL) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	773 /* Error occurred via symtable call to
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	774 is_constant_false */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	775 PyErr_SetString(exc, msg);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	776 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	777 }
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	778 c->c_errors++;
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	779 if (c->c_lineno < 1 \|\| c->c_interactive) {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	780 /* Unknown line number or interactive input */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	781 PyErr_SetString(exc, msg);
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	782 return;
46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	783 }
13993 716e1c4e3f78 When raising a SyntaxError, make a best-effort attempt to set the Fred Drake <fdrake@acm.org> parents: 13956 diff changeset	784 v = PyString_FromString(msg);
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	785 if (v == NULL)
46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	786 return; /* MemoryError, too bad */
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	787
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16831 diff changeset	788 line = PyErr_ProgramText(c->c_filename, c->c_lineno);
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	789 if (line == NULL) {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	790 Py_INCREF(Py_None);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	791 line = Py_None;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	792 }
22120 b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	793 if (exc == PyExc_SyntaxError) {
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	794 t = Py_BuildValue("(ziOO)", c->c_filename, c->c_lineno,
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	795 Py_None, line);
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	796 if (t == NULL)
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	797 goto exit;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30488 diff changeset	798 w = PyTuple_Pack(2, v, t);
22120 b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	799 if (w == NULL)
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	800 goto exit;
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	801 PyErr_SetObject(exc, w);
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	802 } else {
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	803 /* Make sure additional exceptions are printed with
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	804 file and line, also. */
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	805 PyErr_SetObject(exc, v);
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	806 PyErr_SyntaxLocation(c->c_filename, c->c_lineno);
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	807 }
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	808 exit:
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	809 Py_XDECREF(t);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	810 Py_XDECREF(v);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	811 Py_XDECREF(w);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	812 Py_XDECREF(line);
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	813 }
46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	814
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	815 /* Interface to the block stack */
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	816
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	817 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	818 block_push(struct compiling *c, int type)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	819 {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	820 if (c->c_nblocks >= CO_MAXBLOCKS) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	821 com_error(c, PyExc_SystemError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	822 "too many statically nested blocks");
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	823 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	824 else {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	825 c->c_block[c->c_nblocks++] = type;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	826 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	827 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	828
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	829 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	830 block_pop(struct compiling *c, int type)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	831 {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	832 if (c->c_nblocks > 0)
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	833 c->c_nblocks--;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	834 if (c->c_block[c->c_nblocks] != type && c->c_errors == 0) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	835 com_error(c, PyExc_SystemError, "bad block pop");
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	836 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	837 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	838
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	839 /* Prototype forward declarations */
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	840
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	841 static int issue_warning(const char , const char , int);
cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	842 static int com_init(struct compiling , const char );
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	843 static void com_free(struct compiling *);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	844 static void com_push(struct compiling *, int);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	845 static void com_pop(struct compiling *, int);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	846 static void com_done(struct compiling *);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	847 static void com_node(struct compiling , node );
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	848 static void com_factor(struct compiling , node );
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	849 static void com_addbyte(struct compiling *, int);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	850 static void com_addint(struct compiling *, int);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	851 static void com_addoparg(struct compiling *, int, int);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	852 static void com_addfwref(struct compiling , int, int );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	853 static void com_backpatch(struct compiling *, int);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	854 static int com_add(struct compiling , PyObject , PyObject , PyObject );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	855 static int com_addconst(struct compiling , PyObject );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	856 static int com_addname(struct compiling , PyObject );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	857 static void com_addopname(struct compiling , int, node );
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	858 static void com_test(struct compiling c, node n);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	859 static void com_list(struct compiling , node , int);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	860 static void com_list_iter(struct compiling , node , node , char );
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	861 static void com_gen_iter(struct compiling , node , node *);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	862 static int com_argdefs(struct compiling , node );
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	863 static void com_assign(struct compiling , node , int, node *);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	864 static void com_assign_name(struct compiling , node , int);
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	865 static int com_make_closure(struct compiling c, PyCodeObject co);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	866
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	867 static PyCodeObject icompile(node , struct compiling *);
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	868 static PyCodeObject jcompile(node , const char , struct compiling ,
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	869 PyCompilerFlags *);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	870 static PyObject parsestrplus(struct compiling, node *);
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	871 static PyObject parsestr(struct compiling , char *);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	872 static node get_rawdocstring(node );
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	873
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	874 static int get_ref_type(struct compiling , char );
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	875
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	876 /* symtable operations */
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	877 static int symtable_lookup(struct symtable st, char name);
29869 3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	878 static struct symtable symtable_build(node , PyFutureFeatures *,
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	879 const char *filename);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	880 static int symtable_load_symbols(struct compiling *);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	881 static struct symtable *symtable_init(void);
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	882 static void symtable_enter_scope(struct symtable , char , int, int);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	883 static int symtable_exit_scope(struct symtable *);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	884 static int symtable_add_def(struct symtable , char , int);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	885 static int symtable_add_def_o(struct symtable , PyObject , PyObject *, int);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	886
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	887 static void symtable_node(struct symtable , node );
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	888 static void symtable_funcdef(struct symtable , node );
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	889 static void symtable_default_args(struct symtable , node );
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	890 static void symtable_params(struct symtable , node );
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	891 static void symtable_params_fplist(struct symtable , node n);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	892 static void symtable_global(struct symtable , node );
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	893 static void symtable_import(struct symtable , node );
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	894 static void symtable_assign(struct symtable , node , int);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	895 static void symtable_list_comprehension(struct symtable , node );
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	896 static void symtable_generator_expression(struct symtable , node );
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	897 static void symtable_list_for(struct symtable , node );
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	898 static void symtable_gen_for(struct symtable , node , int);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	899 static void symtable_gen_iter(struct symtable , node );
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	900
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	901 static int symtable_update_free_vars(struct symtable *);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	902 static int symtable_undo_free(struct symtable , PyObject , PyObject *);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	903 static int symtable_check_global(struct symtable , PyObject , PyObject *);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	904
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	905 /* helper */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	906 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	907 do_pad(int pad)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	908 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	909 int i;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	910 for (i = 0; i < pad; ++i)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	911 fprintf(stderr, " ");
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	912 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	913
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	914 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	915 dump(node *n, int pad, int depth)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	916 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	917 int i;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	918 if (depth == 0)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	919 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	920 do_pad(pad);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	921 fprintf(stderr, "%d: %s\n", TYPE(n), STR(n));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	922 if (depth > 0)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	923 depth--;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	924 for (i = 0; i < NCH(n); ++i)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	925 dump(CHILD(n, i), pad + 1, depth);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	926 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	927
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	928 static int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	929 com_init(struct compiling c, const char filename)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	930 {
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	931 memset((void *)c, '\0', sizeof(struct compiling));
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	932 if ((c->c_code = PyString_FromStringAndSize((char *)NULL,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	933 1000)) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	934 goto fail;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	935 if ((c->c_consts = PyList_New(0)) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	936 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	937 if ((c->c_const_dict = PyDict_New()) == NULL)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	938 goto fail;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	939 if ((c->c_names = PyList_New(0)) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	940 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	941 if ((c->c_name_dict = PyDict_New()) == NULL)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	942 goto fail;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	943 if ((c->c_locals = PyDict_New()) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	944 goto fail;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	945 if ((c->c_lnotab = PyString_FromStringAndSize((char *)NULL,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	946 1000)) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	947 goto fail;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	948 c->c_globals = NULL;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	949 c->c_varnames = NULL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	950 c->c_freevars = NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	951 c->c_cellvars = NULL;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	952 c->c_nlocals = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	953 c->c_argcount = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	954 c->c_flags = 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	955 c->c_nexti = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	956 c->c_errors = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	957 c->c_infunction = 0;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	958 c->c_interactive = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	959 c->c_loops = 0;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	960 c->c_begin = 0;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	961 c->c_nblocks = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	962 c->c_filename = filename;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	963 c->c_name = "?";
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	964 c->c_lineno = 0;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	965 c->c_stacklevel = 0;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	966 c->c_maxstacklevel = 0;
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	967 c->c_firstlineno = 0;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	968 c->c_last_addr = 0;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	969 c->c_last_line = 0;
16096 fb67122e5c1e com_init(): My entry into the smallest patch possible category. Barry Warsaw <barry@python.org> parents: 16060 diff changeset	970 c->c_lnotab_next = 0;
31764 5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	971 c->c_lnotab_last = 0;
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	972 c->c_tmpname = 0;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	973 c->c_nested = 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	974 c->c_closure = 0;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	975 c->c_symtable = NULL;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	976 return 1;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	977
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	978 fail:
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	979 com_free(c);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	980 return 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	981 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	982
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	983 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	984 com_free(struct compiling *c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	985 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	986 Py_XDECREF(c->c_code);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	987 Py_XDECREF(c->c_consts);
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	988 Py_XDECREF(c->c_const_dict);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	989 Py_XDECREF(c->c_names);
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	990 Py_XDECREF(c->c_name_dict);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	991 Py_XDECREF(c->c_globals);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	992 Py_XDECREF(c->c_locals);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	993 Py_XDECREF(c->c_varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	994 Py_XDECREF(c->c_freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	995 Py_XDECREF(c->c_cellvars);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	996 Py_XDECREF(c->c_lnotab);
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	997 if (c->c_future)
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	998 PyObject_FREE((void *)c->c_future);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	999 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1000
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1001 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1002 com_push(struct compiling *c, int n)
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1003 {
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1004 c->c_stacklevel += n;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1005 if (c->c_stacklevel > c->c_maxstacklevel) {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1006 c->c_maxstacklevel = c->c_stacklevel;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1007 /*
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1008 fprintf(stderr, "%s:%s:%d max stack nexti=%d level=%d n=%d\n",
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1009 c->c_filename, c->c_name, c->c_lineno,
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1010 c->c_nexti, c->c_stacklevel, n);
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1011 */
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1012 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1013 }
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1014
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1015 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1016 com_pop(struct compiling *c, int n)
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1017 {
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1018 if (c->c_stacklevel < n)
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1019 c->c_stacklevel = 0;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1020 else
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1021 c->c_stacklevel -= n;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1022 }
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1023
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1024 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1025 com_done(struct compiling *c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1026 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1027 if (c->c_code != NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1028 _PyString_Resize(&c->c_code, c->c_nexti);
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1029 if (c->c_lnotab != NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1030 _PyString_Resize(&c->c_lnotab, c->c_lnotab_next);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1031 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1032
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1033 static int
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1034 com_check_size(PyObject **s, int offset)
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1035 {
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1036 int len = PyString_GET_SIZE(*s);
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1037 if (offset >= len)
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1038 return _PyString_Resize(s, len * 2);
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1039 return 0;
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1040 }
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1041
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1042 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1043 com_addbyte(struct compiling *c, int byte)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1044 {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1045 /fprintf(stderr, "%3d: %3d\n", c->c_nexti, byte);/
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1046 assert(byte >= 0 && byte <= 255);
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	1047 assert(c->c_code != 0);
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1048 if (com_check_size(&c->c_code, c->c_nexti)) {
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1049 c->c_errors++;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1050 return;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1051 }
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1052 PyString_AS_STRING(c->c_code)[c->c_nexti++] = byte;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1053 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1054
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1055 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1056 com_addint(struct compiling *c, int x)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1057 {
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	1058 com_addbyte(c, x & 0xff);
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	1059 com_addbyte(c, x >> 8); /* XXX x should be positive */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1060 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1061
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1062 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1063 com_add_lnotab(struct compiling *c, int addr, int line)
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1064 {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1065 char *p;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1066 if (c->c_lnotab == NULL)
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1067 return;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1068 if (com_check_size(&c->c_lnotab, c->c_lnotab_next + 2)) {
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1069 c->c_errors++;
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1070 return;
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1071 }
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1072 p = PyString_AS_STRING(c->c_lnotab) + c->c_lnotab_next;
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1073 *p++ = addr;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1074 *p++ = line;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1075 c->c_lnotab_next += 2;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1076 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1077
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1078 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1079 com_set_lineno(struct compiling *c, int lineno)
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1080 {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1081 c->c_lineno = lineno;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1082 if (c->c_firstlineno == 0) {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1083 c->c_firstlineno = c->c_last_line = lineno;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1084 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1085 else {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1086 int incr_addr = c->c_nexti - c->c_last_addr;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1087 int incr_line = lineno - c->c_last_line;
31764 5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1088 c->c_lnotab_last = c->c_lnotab_next;
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1089 while (incr_addr > 255) {
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1090 com_add_lnotab(c, 255, 0);
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1091 incr_addr -= 255;
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1092 }
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1093 while (incr_line > 255) {
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1094 com_add_lnotab(c, incr_addr, 255);
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1095 incr_line -=255;
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1096 incr_addr = 0;
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1097 }
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1098 if (incr_addr > 0 \|\| incr_line > 0)
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	1099 com_add_lnotab(c, incr_addr, incr_line);
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1100 c->c_last_addr = c->c_nexti;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1101 c->c_last_line = lineno;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1102 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1103 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1104
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	1105 static void
31764 5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1106 com_strip_lnotab(struct compiling *c)
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1107 {
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1108 /* strip the last lnotab entry if no opcode were emitted.
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1109 * This prevents a line number to be generated on a final
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1110 * pass, like in the following example:
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1111 *
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1112 * if a:
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1113 * print 5
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1114 * else:
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1115 * pass
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1116 *
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1117 * Without the fix, a line trace event would be generated
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1118 * on the pass even if a is true (because of the implicit
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1119 * return).
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1120 */
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1121 if (c->c_nexti == c->c_last_addr && c->c_lnotab_last > 0) {
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1122 c->c_lnotab_next = c->c_lnotab_last;
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1123 }
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1124 }
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1125
5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	1126 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1127 com_addoparg(struct compiling *c, int op, int arg)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1128 {
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1129 int extended_arg = arg >> 16;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1130 if (extended_arg){
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1131 com_addbyte(c, EXTENDED_ARG);
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1132 com_addint(c, extended_arg);
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1133 arg &= 0xffff;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1134 }
5164 8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	1135 com_addbyte(c, op);
8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	1136 com_addint(c, arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1137 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1138
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1139 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1140 com_addfwref(struct compiling c, int op, int p_anchor)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1141 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1142 /* Compile a forward reference for backpatching */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1143 int here;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1144 int anchor;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1145 com_addbyte(c, op);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1146 here = c->c_nexti;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1147 anchor = *p_anchor;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1148 *p_anchor = here;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1149 com_addint(c, anchor == 0 ? 0 : here - anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1150 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1151
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1152 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1153 com_backpatch(struct compiling *c, int anchor)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1154 {
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	1155 unsigned char code = (unsigned char ) PyString_AS_STRING(c->c_code);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1156 int target = c->c_nexti;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1157 int dist;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1158 int prev;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1159 for (;;) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1160 /* Make the JUMP instruction at anchor point to target */
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	1161 prev = code[anchor] + (code[anchor+1] << 8);
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	1162 dist = target - (anchor+2);
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	1163 code[anchor] = dist & 0xff;
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1164 dist >>= 8;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1165 code[anchor+1] = dist;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1166 dist >>= 8;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1167 if (dist) {
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1168 com_error(c, PyExc_SystemError,
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1169 "com_backpatch: offset too large");
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1170 break;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	1171 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1172 if (!prev)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1173 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1174 anchor -= prev;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1175 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1176 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1177
544 d0baa8300005 Minor changes. Guido van Rossum <guido@python.org> parents: 493 diff changeset	1178 /* Handle literals and names uniformly */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1179
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1180 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1181 com_add(struct compiling c, PyObject list, PyObject dict, PyObject v)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1182 {
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1183 PyObject w, t, *np=NULL;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1184 long n;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1185
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30488 diff changeset	1186 t = PyTuple_Pack(2, v, v->ob_type);
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1187 if (t == NULL)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1188 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1189 w = PyDict_GetItem(dict, t);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1190 if (w != NULL) {
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1191 n = PyInt_AsLong(w);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1192 } else {
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1193 n = PyList_Size(list);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1194 np = PyInt_FromLong(n);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1195 if (np == NULL)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1196 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1197 if (PyList_Append(list, v) != 0)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1198 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1199 if (PyDict_SetItem(dict, t, np) != 0)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1200 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1201 Py_DECREF(np);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	1202 }
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1203 Py_DECREF(t);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	1204 return n;
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1205 fail:
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1206 Py_XDECREF(np);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1207 Py_XDECREF(t);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1208 c->c_errors++;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1209 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1210 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1211
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1212 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1213 com_addconst(struct compiling c, PyObject v)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1214 {
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1215 return com_add(c, c->c_consts, c->c_const_dict, v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1216 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1217
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1218 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1219 com_addname(struct compiling c, PyObject v)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1220 {
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	1221 return com_add(c, c->c_names, c->c_name_dict, v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1222 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1223
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	1224 int
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	1225 _Py_Mangle(char p, char name, char *buffer, size_t maxlen)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1226 {
4131 6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	1227 /* Name mangling: __private becomes _classname__private.
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1228 This is independent from how the name is used. */
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1229 size_t nlen, plen;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1230 if (p == NULL \|\| name == NULL \|\| name[0] != '_' \|\| name[1] != '_')
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1231 return 0;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1232 nlen = strlen(name);
4131 6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	1233 if (nlen+2 >= maxlen)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1234 return 0; /* Don't mangle __extremely_long_names */
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1235 if (name[nlen-1] == '_' && name[nlen-2] == '_')
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1236 return 0; /* Don't mangle __whatever__ */
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1237 /* Strip leading underscores from class name */
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1238 while (*p == '_')
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1239 p++;
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1240 if (*p == '\0')
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1241 return 0; /* Don't mangle if class is just underscores */
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1242 plen = strlen(p);
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1243 if (plen + nlen >= maxlen)
4131 6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	1244 plen = maxlen-nlen-2; /* Truncate class name if too long */
6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	1245 /* buffer = "_" + p[:plen] + name # i.e. 1+plen+nlen bytes */
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1246 buffer[0] = '_';
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1247 strncpy(buffer+1, p, plen);
4131 6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	1248 strcpy(buffer+1+plen, name);
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1249 return 1;
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1250 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1251
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1252 static void
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1253 com_addop_name(struct compiling c, int op, char name)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1254 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1255 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1256 int i;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1257 char buffer[MANGLE_LEN];
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	1258
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	1259 if (_Py_Mangle(c->c_private, name, buffer, sizeof(buffer)))
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	1260 name = buffer;
5009 402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	1261 if (name == NULL \|\| (v = PyString_InternFromString(name)) == NULL) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1262 c->c_errors++;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1263 i = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1264 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1265 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1266 i = com_addname(c, v);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1267 Py_DECREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1268 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1269 com_addoparg(c, op, i);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1270 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1271
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1272 #define NAME_LOCAL 0
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1273 #define NAME_GLOBAL 1
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1274 #define NAME_DEFAULT 2
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1275 #define NAME_CLOSURE 3
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1276
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1277 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1278 com_lookup_arg(PyObject dict, PyObject name)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1279 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1280 PyObject *v = PyDict_GetItem(dict, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1281 if (v == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1282 return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1283 else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1284 return PyInt_AS_LONG(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1285 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1286
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1287 static int
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1288 none_assignment_check(struct compiling c, char name, int assigning)
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1289 {
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1290 if (name[0] == 'N' && strcmp(name, "None") == 0) {
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1291 char *msg;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1292 if (assigning)
27270 392feecd2f1c A. Lloyd Flanagan pointed out a spelling error on c.l.py. Michael W. Hudson <mwh@python.net> parents: 26979 diff changeset	1293 msg = "assignment to None";
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1294 else
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1295 msg = "deleting None";
32723 efca55bbba0a Upgrade None assignment SyntaxWarning to a SyntaxError. Raymond Hettinger <python@rcn.com> parents: 32717 diff changeset	1296 com_error(c, PyExc_SyntaxError, msg);
efca55bbba0a Upgrade None assignment SyntaxWarning to a SyntaxError. Raymond Hettinger <python@rcn.com> parents: 32717 diff changeset	1297 return -1;
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1298 }
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1299 return 0;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1300 }
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1301
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1302 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1303 com_addop_varname(struct compiling c, int kind, char name)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1304 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1305 PyObject *v;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1306 int i, reftype;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1307 int scope = NAME_DEFAULT;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1308 int op = STOP_CODE;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1309 char buffer[MANGLE_LEN];
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1310
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1311 if (kind != VAR_LOAD &&
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1312 none_assignment_check(c, name, kind == VAR_STORE))
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1313 {
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1314 i = 255;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1315 goto done;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1316 }
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	1317 if (_Py_Mangle(c->c_private, name, buffer, sizeof(buffer)))
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1318 name = buffer;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1319 if (name == NULL \|\| (v = PyString_InternFromString(name)) == NULL) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1320 c->c_errors++;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1321 i = 255;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1322 goto done;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1323 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1324
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1325 reftype = get_ref_type(c, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1326 switch (reftype) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1327 case LOCAL:
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	1328 if (c->c_symtable->st_cur->ste_type == TYPE_FUNCTION)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1329 scope = NAME_LOCAL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1330 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1331 case GLOBAL_EXPLICIT:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1332 scope = NAME_GLOBAL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1333 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1334 case GLOBAL_IMPLICIT:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1335 if (c->c_flags & CO_OPTIMIZED)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1336 scope = NAME_GLOBAL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1337 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1338 case FREE:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1339 case CELL:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1340 scope = NAME_CLOSURE;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1341 break;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1342 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1343
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1344 i = com_addname(c, v);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1345 if (scope == NAME_LOCAL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1346 i = com_lookup_arg(c->c_locals, v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1347 else if (reftype == FREE)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1348 i = com_lookup_arg(c->c_freevars, v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1349 else if (reftype == CELL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1350 i = com_lookup_arg(c->c_cellvars, v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1351 if (i == -1) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1352 c->c_errors++; /* XXX no exception set */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1353 i = 255;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1354 goto done;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1355 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1356 Py_DECREF(v);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1357
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1358 switch (kind) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1359 case VAR_LOAD:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1360 switch (scope) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1361 case NAME_LOCAL:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1362 op = LOAD_FAST;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1363 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1364 case NAME_GLOBAL:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1365 op = LOAD_GLOBAL;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1366 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1367 case NAME_DEFAULT:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1368 op = LOAD_NAME;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1369 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1370 case NAME_CLOSURE:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1371 op = LOAD_DEREF;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1372 break;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1373 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1374 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1375 case VAR_STORE:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1376 switch (scope) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1377 case NAME_LOCAL:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1378 op = STORE_FAST;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1379 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1380 case NAME_GLOBAL:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1381 op = STORE_GLOBAL;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1382 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1383 case NAME_DEFAULT:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1384 op = STORE_NAME;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1385 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1386 case NAME_CLOSURE:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1387 op = STORE_DEREF;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1388 break;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1389 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1390 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1391 case VAR_DELETE:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1392 switch (scope) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1393 case NAME_LOCAL:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1394 op = DELETE_FAST;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1395 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1396 case NAME_GLOBAL:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1397 op = DELETE_GLOBAL;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1398 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1399 case NAME_DEFAULT:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1400 op = DELETE_NAME;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1401 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1402 case NAME_CLOSURE: {
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	1403 char buf[500];
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	1404 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	1405 DEL_CLOSURE_ERROR, name);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1406 com_error(c, PyExc_SyntaxError, buf);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1407 i = 255;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1408 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1409 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1410 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1411 break;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1412 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1413 done:
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1414 com_addoparg(c, op, i);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1415 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1416
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1417 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1418 com_addopname(struct compiling c, int op, node n)
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1419 {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1420 char *name;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1421 char buffer[1000];
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1422 /* XXX it is possible to write this code without the 1000
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1423 chars on the total length of dotted names, I just can't be
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1424 bothered right now */
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1425 if (TYPE(n) == STAR)
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1426 name = "*";
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1427 else if (TYPE(n) == dotted_name) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1428 char *p = buffer;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1429 int i;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1430 name = buffer;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1431 for (i = 0; i < NCH(n); i += 2) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1432 char *s = STR(CHILD(n, i));
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1433 if (p + strlen(s) > buffer + (sizeof buffer) - 2) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1434 com_error(c, PyExc_MemoryError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	1435 "dotted_name too long");
2367 915fabec64a3 fix typo (== for =) in assignment Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1436 name = NULL;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1437 break;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1438 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1439 if (p != buffer)
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1440 *p++ = '.';
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1441 strcpy(p, s);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1442 p = strchr(p, '\0');
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1443 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1444 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1445 else {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1446 REQ(n, NAME);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1447 name = STR(n);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1448 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1449 com_addop_name(c, op, name);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1450 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1451
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1452 static PyObject *
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1453 parsenumber(struct compiling c, char s)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1454 {
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1455 char *end;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1456 long x;
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1457 double dx;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1458 #ifndef WITHOUT_COMPLEX
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1459 int imflag;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1460 #endif
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1461
176 229168a2fe28 Added error checking for numeric constants; added local/global variable Guido van Rossum <guido@python.org> parents: 160 diff changeset	1462 errno = 0;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1463 end = s + strlen(s) - 1;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1464 #ifndef WITHOUT_COMPLEX
3366 c25865884649 only use 'j' for imaginary constants Guido van Rossum <guido@python.org> parents: 3349 diff changeset	1465 imflag = end == 'j' \|\| end == 'J';
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1466 #endif
744 834dd4a77ee2 fix what lint found Guido van Rossum <guido@python.org> parents: 703 diff changeset	1467 if (end == 'l' \|\| end == 'L')
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1468 return PyLong_FromString(s, (char **)0, 0);
24736 ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24630 diff changeset	1469 if (s[0] == '0') {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1470 x = (long) PyOS_strtoul(s, &end, 0);
24736 ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24630 diff changeset	1471 if (x < 0 && errno == 0) {
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 30713 diff changeset	1472 return PyLong_FromString(s, (char **)0, 0);
24736 ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24630 diff changeset	1473 }
ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24630 diff changeset	1474 }
617 755bb8efcc2d Use strtoul() for oct/hex constants. Guido van Rossum <guido@python.org> parents: 584 diff changeset	1475 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1476 x = PyOS_strtol(s, &end, 0);
176 229168a2fe28 Added error checking for numeric constants; added local/global variable Guido van Rossum <guido@python.org> parents: 160 diff changeset	1477 if (*end == '\0') {
19502 62bf9401a1ac If an integer constant can't be generated from an integer literal Jeremy Hylton <jeremy@alum.mit.edu> parents: 19343 diff changeset	1478 if (errno != 0)
62bf9401a1ac If an integer constant can't be generated from an integer literal Jeremy Hylton <jeremy@alum.mit.edu> parents: 19343 diff changeset	1479 return PyLong_FromString(s, (char **)0, 0);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1480 return PyInt_FromLong(x);
176 229168a2fe28 Added error checking for numeric constants; added local/global variable Guido van Rossum <guido@python.org> parents: 160 diff changeset	1481 }
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1482 /* XXX Huge floats may silently fail */
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1483 #ifndef WITHOUT_COMPLEX
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1484 if (imflag) {
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1485 Py_complex z;
136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1486 z.real = 0.;
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1487 PyFPE_START_PROTECT("atof", return 0)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 32121 diff changeset	1488 z.imag = PyOS_ascii_atof(s);
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1489 PyFPE_END_PROTECT(z)
136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1490 return PyComplex_FromCComplex(z);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1491 }
6453 c9b139b9c5ff Fixed for WITHOUT_COMPLEX compilation (Jack) Guido van Rossum <guido@python.org> parents: 6186 diff changeset	1492 else
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1493 #endif
6453 c9b139b9c5ff Fixed for WITHOUT_COMPLEX compilation (Jack) Guido van Rossum <guido@python.org> parents: 6186 diff changeset	1494 {
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1495 PyFPE_START_PROTECT("atof", return 0)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 32121 diff changeset	1496 dx = PyOS_ascii_atof(s);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5183 diff changeset	1497 PyFPE_END_PROTECT(dx)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1498 return PyFloat_FromDouble(dx);
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1499 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1500 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1501
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1502 static PyObject *
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1503 decode_utf8(char *sPtr, char end, char* encoding)
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1504 {
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1505 #ifndef Py_USING_UNICODE
24630 43caa212b959 Use Py_FatalError instead of abort. Martin v. Löwis <martin@v.loewis.de> parents: 24624 diff changeset	1506 Py_FatalError("decode_utf8 should not be called in this build.");
43caa212b959 Use Py_FatalError instead of abort. Martin v. Löwis <martin@v.loewis.de> parents: 24624 diff changeset	1507 return NULL;
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1508 #else
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1509 PyObject u, v;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1510 char s, t;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1511 t = s = *sPtr;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1512 /* while (s < end && s != '\\') s++; / /* inefficient for u".." */
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1513 while (s < end && (*s & 0x80)) s++;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1514 *sPtr = s;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1515 u = PyUnicode_DecodeUTF8(t, s - t, NULL);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1516 if (u == NULL)
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1517 return NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1518 v = PyUnicode_AsEncodedString(u, encoding, NULL);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1519 Py_DECREF(u);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1520 return v;
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1521 #endif
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1522 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1523
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26756 diff changeset	1524 /* compiler.transformer.Transformer.decode_literal depends on what
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26756 diff changeset	1525 might seem like minor details of this function -- changes here
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26756 diff changeset	1526 must be reflected there. */
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1527 static PyObject *
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1528 parsestr(struct compiling c, char s)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1529 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1530 PyObject *v;
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1531 size_t len;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24770 diff changeset	1532 int quote = *s;
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1533 int rawmode = 0;
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1534 char* encoding = ((c == NULL) ? NULL : c->c_encoding);
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1535 int need_encoding;
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1536 int unicode = 0;
23555 c4fa37f89783 Accept u"..." literals even when Unicode is disabled. But these Guido van Rossum <guido@python.org> parents: 23538 diff changeset	1537
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1538 if (isalpha(quote) \|\| quote == '_') {
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1539 if (quote == 'u' \|\| quote == 'U') {
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1540 quote = *++s;
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1541 unicode = 1;
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1542 }
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1543 if (quote == 'r' \|\| quote == 'R') {
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1544 quote = *++s;
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1545 rawmode = 1;
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1546 }
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1547 }
1364 132602d854d8 Changes to accept double-quoted strings on input. Guido van Rossum <guido@python.org> parents: 1354 diff changeset	1548 if (quote != '\'' && quote != '\"') {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1549 PyErr_BadInternalCall();
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1550 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1551 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1552 s++;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1553 len = strlen(s);
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1554 if (len > INT_MAX) {
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1555 com_error(c, PyExc_OverflowError,
22120 b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	1556 "string to parse is too long");
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1557 return NULL;
8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1558 }
1364 132602d854d8 Changes to accept double-quoted strings on input. Guido van Rossum <guido@python.org> parents: 1354 diff changeset	1559 if (s[--len] != quote) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1560 PyErr_BadInternalCall();
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1561 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1562 }
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1563 if (len >= 4 && s[0] == quote && s[1] == quote) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1564 s += 2;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1565 len -= 2;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1566 if (s[--len] != quote \|\| s[--len] != quote) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1567 PyErr_BadInternalCall();
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1568 return NULL;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1569 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1570 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1571 #ifdef Py_USING_UNICODE
12538 859e500f0760 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12522 diff changeset	1572 if (unicode \|\| Py_UnicodeFlag) {
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1573 PyObject u, w;
26319 90e9a3ecda44 Move three variables that are only used inside an if block into the block, Walter Dörwald <walter@livinglogic.de> parents: 25538 diff changeset	1574 char *buf;
90e9a3ecda44 Move three variables that are only used inside an if block into the block, Walter Dörwald <walter@livinglogic.de> parents: 25538 diff changeset	1575 char *p;
90e9a3ecda44 Move three variables that are only used inside an if block into the block, Walter Dörwald <walter@livinglogic.de> parents: 25538 diff changeset	1576 char *end;
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1577 if (encoding == NULL) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1578 buf = s;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1579 u = NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1580 } else if (strcmp(encoding, "iso-8859-1") == 0) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1581 buf = s;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1582 u = NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1583 } else {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1584 /* "\XX" may become "\u005c\uHHLL" (12 bytes) */
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1585 u = PyString_FromStringAndSize((char )NULL, len 4);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1586 if (u == NULL)
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1587 return NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1588 p = buf = PyString_AsString(u);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1589 end = s + len;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1590 while (s < end) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1591 if (*s == '\\') {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1592 p++ = s++;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1593 if (*s & 0x80) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1594 strcpy(p, "u005c");
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1595 p += 5;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1596 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1597 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1598 if (s & 0x80) { / XXX inefficient */
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1599 char *r;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1600 int rn, i;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1601 w = decode_utf8(&s, end, "utf-16-be");
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1602 if (w == NULL) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1603 Py_DECREF(u);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1604 return NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1605 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1606 r = PyString_AsString(w);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1607 rn = PyString_Size(w);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1608 assert(rn % 2 == 0);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1609 for (i = 0; i < rn; i += 2) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1610 sprintf(p, "\\u%02x%02x",
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1611 r[i + 0] & 0xFF,
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1612 r[i + 1] & 0xFF);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1613 p += 6;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1614 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1615 Py_DECREF(w);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1616 } else {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1617 p++ = s++;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1618 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1619 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1620 len = p - buf;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1621 }
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1622 if (rawmode)
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1623 v = PyUnicode_DecodeRawUnicodeEscape(buf, len, NULL);
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1624 else
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1625 v = PyUnicode_DecodeUnicodeEscape(buf, len, NULL);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1626 Py_XDECREF(u);
22120 b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	1627 if (v == NULL)
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1628 PyErr_SyntaxLocation(c->c_filename, c->c_lineno);
22120 b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	1629 return v;
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	1630
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1631 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1632 #endif
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1633 need_encoding = (encoding != NULL &&
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1634 strcmp(encoding, "utf-8") != 0 &&
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1635 strcmp(encoding, "iso-8859-1") != 0);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1636 if (rawmode \|\| strchr(s, '\\') == NULL) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1637 if (need_encoding) {
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1638 #ifndef Py_USING_UNICODE
6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1639 /* This should not happen - we never see any other
6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1640 encoding. */
24630 43caa212b959 Use Py_FatalError instead of abort. Martin v. Löwis <martin@v.loewis.de> parents: 24624 diff changeset	1641 Py_FatalError("cannot deal with encodings in this build.");
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1642 #else
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1643 PyObject* u = PyUnicode_DecodeUTF8(s, len, NULL);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1644 if (u == NULL)
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1645 return NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1646 v = PyUnicode_AsEncodedString(u, encoding, NULL);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1647 Py_DECREF(u);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1648 return v;
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1649 #endif
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1650 } else {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1651 return PyString_FromStringAndSize(s, len);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1652 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1653 }
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24770 diff changeset	1654
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24770 diff changeset	1655 v = PyString_DecodeEscape(s, len, NULL, unicode,
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24770 diff changeset	1656 need_encoding ? encoding : NULL);
14382 2d6cf68aa64a changed \x to consume exactly two hex digits. implements PEP-223 Fredrik Lundh <fredrik@pythonware.com> parents: 14375 diff changeset	1657 if (v == NULL)
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1658 PyErr_SyntaxLocation(c->c_filename, c->c_lineno);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1659 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1660 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1661
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1662 static PyObject *
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1663 parsestrplus(struct compiling* c, node *n)
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1664 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1665 PyObject *v;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1666 int i;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1667 REQ(CHILD(n, 0), STRING);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1668 if ((v = parsestr(c, STR(CHILD(n, 0)))) != NULL) {
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1669 /* String literal concatenation */
12388 c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1670 for (i = 1; i < NCH(n); i++) {
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1671 PyObject *s;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1672 s = parsestr(c, STR(CHILD(n, i)));
12388 c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1673 if (s == NULL)
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1674 goto onError;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1675 if (PyString_Check(v) && PyString_Check(s)) {
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1676 PyString_ConcatAndDel(&v, s);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1677 if (v == NULL)
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1678 goto onError;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1679 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1680 #ifdef Py_USING_UNICODE
12388 c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1681 else {
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1682 PyObject *temp;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1683 temp = PyUnicode_Concat(v, s);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1684 Py_DECREF(s);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1685 if (temp == NULL)
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1686 goto onError;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1687 Py_DECREF(v);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1688 v = temp;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1689 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1690 #endif
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1691 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1692 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1693 return v;
12388 c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1694
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1695 onError:
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1696 Py_XDECREF(v);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1697 return NULL;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1698 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1699
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1700 static void
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1701 com_list_for(struct compiling c, node n, node e, char t)
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1702 {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1703 int anchor = 0;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1704 int save_begin = c->c_begin;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1705
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1706 /* list_for: for v in expr [list_iter] */
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1707 com_node(c, CHILD(n, 3)); /* expr */
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	1708 com_addbyte(c, GET_ITER);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1709 c->c_begin = c->c_nexti;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	1710 com_addfwref(c, FOR_ITER, &anchor);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1711 com_push(c, 1);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1712 com_assign(c, CHILD(n, 1), OP_ASSIGN, NULL);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1713 c->c_loops++;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1714 com_list_iter(c, n, e, t);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1715 c->c_loops--;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1716 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1717 c->c_begin = save_begin;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1718 com_backpatch(c, anchor);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	1719 com_pop(c, 1); /* FOR_ITER has popped this */
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1720 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1721
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1722 static void
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1723 com_gen_for(struct compiling c, node n, node *t, int is_outmost)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1724 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1725 int break_anchor = 0;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1726 int anchor = 0;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1727 int save_begin = c->c_begin;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1728
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1729 REQ(n, gen_for);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1730 /* gen_for: for v in test [gen_iter] */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1731
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1732 com_addfwref(c, SETUP_LOOP, &break_anchor);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1733 block_push(c, SETUP_LOOP);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1734
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1735 if (is_outmost) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1736 com_addop_varname(c, VAR_LOAD, "[outmost-iterable]");
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1737 com_push(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1738 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1739 else {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1740 com_node(c, CHILD(n, 3));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1741 com_addbyte(c, GET_ITER);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1742 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1743
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1744 c->c_begin = c->c_nexti;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1745 com_set_lineno(c, c->c_last_line);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1746 com_addfwref(c, FOR_ITER, &anchor);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1747 com_push(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1748 com_assign(c, CHILD(n, 1), OP_ASSIGN, NULL);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1749
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1750 if (NCH(n) == 5)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1751 com_gen_iter(c, CHILD(n, 4), t);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1752 else {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1753 com_test(c, t);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1754 com_addbyte(c, YIELD_VALUE);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1755 com_pop(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1756 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1757
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1758 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1759 c->c_begin = save_begin;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1760
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1761 com_backpatch(c, anchor);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1762 com_pop(c, 1); /* FOR_ITER has popped this */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1763 com_addbyte(c, POP_BLOCK);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1764 block_pop(c, SETUP_LOOP);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1765 com_backpatch(c, break_anchor);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1766 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1767
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1768 static void
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1769 com_list_if(struct compiling c, node n, node e, char t)
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1770 {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1771 int anchor = 0;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1772 int a = 0;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1773 /* list_iter: 'if' test [list_iter] */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1774 com_node(c, CHILD(n, 1));
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1775 com_addfwref(c, JUMP_IF_FALSE, &a);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1776 com_addbyte(c, POP_TOP);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1777 com_pop(c, 1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1778 com_list_iter(c, n, e, t);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1779 com_addfwref(c, JUMP_FORWARD, &anchor);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1780 com_backpatch(c, a);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1781 /* We jump here with an extra entry which we now pop */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1782 com_addbyte(c, POP_TOP);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1783 com_backpatch(c, anchor);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1784 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1785
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1786 static void
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1787 com_gen_if(struct compiling c, node n, node *t)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1788 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1789 /* gen_if: 'if' test [gen_iter] */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1790 int anchor = 0;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1791 int a=0;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1792
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1793 com_node(c, CHILD(n, 1));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1794 com_addfwref(c, JUMP_IF_FALSE, &a);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1795 com_addbyte(c, POP_TOP);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1796 com_pop(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1797
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1798 if (NCH(n) == 3)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1799 com_gen_iter(c, CHILD(n, 2), t);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1800 else {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1801 com_test(c, t);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1802 com_addbyte(c, YIELD_VALUE);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1803 com_pop(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1804 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1805 com_addfwref(c, JUMP_FORWARD, &anchor);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1806 com_backpatch(c, a);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1807 /* We jump here with an extra entry which we now pop */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1808 com_addbyte(c, POP_TOP);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1809 com_backpatch(c, anchor);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1810 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1811
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1812 static void
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1813 com_list_iter(struct compiling *c,
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1814 node p, / parent of list_iter node */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1815 node e, / element expression node */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1816 char t / name of result list temp local */)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1817 {
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1818 /* list_iter is the last child in a listmaker, list_for, or list_if */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1819 node *n = CHILD(p, NCH(p)-1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1820 if (TYPE(n) == list_iter) {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1821 n = CHILD(n, 0);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1822 switch (TYPE(n)) {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1823 case list_for:
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1824 com_list_for(c, n, e, t);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1825 break;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1826 case list_if:
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1827 com_list_if(c, n, e, t);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1828 break;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1829 default:
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1830 com_error(c, PyExc_SystemError,
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1831 "invalid list_iter node type");
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1832 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1833 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1834 else {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1835 com_addop_varname(c, VAR_LOAD, t);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1836 com_push(c, 1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1837 com_node(c, e);
31618 bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31042 diff changeset	1838 com_addbyte(c, LIST_APPEND);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1839 com_pop(c, 2);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1840 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1841 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1842
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1843 static void
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1844 com_gen_iter(struct compiling c, node n, node *t)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1845 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1846 /* gen_iter: gen_for \| gen_if */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1847 node *ch;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1848 REQ(n, gen_iter);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1849
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1850 ch = CHILD(n, 0);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1851
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1852 switch (TYPE(ch)) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1853 case gen_for:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1854 com_gen_for(c, ch, t, 0);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1855 break;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1856 case gen_if:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1857 com_gen_if(c, ch, t);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1858 break;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1859 default:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1860 com_error(c, PyExc_SystemError,
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1861 "invalid gen_iter node type");
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1862 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1863 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1864
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1865 static void
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1866 com_list_comprehension(struct compiling c, node n)
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1867 {
14117 ac8809959d01 require list comprehensions to start with a for clause Skip Montanaro <skip@pobox.com> parents: 14105 diff changeset	1868 /* listmaker: test list_for */
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	1869 char tmpname[30];
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	1870
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	1871 REQ(n, listmaker);
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	1872 PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]", ++c->c_tmpname);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1873 com_addoparg(c, BUILD_LIST, 0);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1874 com_addbyte(c, DUP_TOP); /* leave the result on the stack */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1875 com_push(c, 2);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1876 com_addop_varname(c, VAR_STORE, tmpname);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1877 com_pop(c, 1);
14117 ac8809959d01 require list comprehensions to start with a for clause Skip Montanaro <skip@pobox.com> parents: 14105 diff changeset	1878 com_list_for(c, CHILD(n, 1), CHILD(n, 0), tmpname);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1879 com_addop_varname(c, VAR_DELETE, tmpname);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1880 --c->c_tmpname;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1881 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1882
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1883 static void
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1884 com_listmaker(struct compiling c, node n)
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1885 {
14117 ac8809959d01 require list comprehensions to start with a for clause Skip Montanaro <skip@pobox.com> parents: 14105 diff changeset	1886 /* listmaker: test ( list_for \| (',' test)* [','] ) */
ac8809959d01 require list comprehensions to start with a for clause Skip Montanaro <skip@pobox.com> parents: 14105 diff changeset	1887 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == list_for)
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1888 com_list_comprehension(c, n);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1889 else {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1890 int len = 0;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1891 int i;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1892 for (i = 0; i < NCH(n); i += 2, len++)
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1893 com_node(c, CHILD(n, i));
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1894 com_addoparg(c, BUILD_LIST, len);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1895 com_pop(c, len-1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1896 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1897 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1898
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1899 static void
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1900 com_generator_expression(struct compiling c, node n)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1901 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1902 /* testlist_gexp: test gen_for */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1903 /* argument: test gen_for */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1904 PyCodeObject *co;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1905
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1906 REQ(CHILD(n, 0), test);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1907 REQ(CHILD(n, 1), gen_for);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1908
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1909 symtable_enter_scope(c->c_symtable, "<genexpr>", TYPE(n),
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1910 n->n_lineno);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1911 co = icompile(n, c);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1912 symtable_exit_scope(c->c_symtable);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1913
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1914 if (co == NULL)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1915 c->c_errors++;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1916 else {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1917 int closure = com_make_closure(c, co);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1918 int i = com_addconst(c, (PyObject *)co);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1919
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1920 com_addoparg(c, LOAD_CONST, i);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1921 com_push(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1922 if (closure)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1923 com_addoparg(c, MAKE_CLOSURE, 0);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1924 else
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1925 com_addoparg(c, MAKE_FUNCTION, 0);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1926
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1927 com_test(c, CHILD(CHILD(n, 1), 3));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1928 com_addbyte(c, GET_ITER);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1929 com_addoparg(c, CALL_FUNCTION, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1930 com_pop(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1931
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1932 Py_DECREF(co);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1933 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1934 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1935
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1936 static void
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1937 com_testlist_gexp(struct compiling c, node n)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1938 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1939 /* testlist_gexp: test ( gen_for \| (',' test)* [','] ) */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1940 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == gen_for)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1941 com_generator_expression(c, n);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1942 else com_list(c, n, 0);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1943 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1944
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	1945
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1946 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1947 com_dictmaker(struct compiling c, node n)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1948 {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1949 int i;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1950 /* dictmaker: test ':' test (',' test ':' value)* [','] */
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1951 for (i = 0; i+2 < NCH(n); i += 4) {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1952 /* We must arrange things just right for STORE_SUBSCR.
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1953 It wants the stack to look like (value) (dict) (key) */
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1954 com_addbyte(c, DUP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1955 com_push(c, 1);
26670 1312297887a3 Fixing bug Gustavo Niemeyer <gustavo@niemeyer.net> parents: 26601 diff changeset	1956 com_node(c, CHILD(n, i)); /* key */
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1957 com_node(c, CHILD(n, i+2)); /* value */
26670 1312297887a3 Fixing bug Gustavo Niemeyer <gustavo@niemeyer.net> parents: 26601 diff changeset	1958 com_addbyte(c, ROT_THREE);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1959 com_addbyte(c, STORE_SUBSCR);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1960 com_pop(c, 3);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1961 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1962 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1963
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1964 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1965 com_atom(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1966 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1967 node *ch;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1968 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1969 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1970 REQ(n, atom);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1971 ch = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1972 switch (TYPE(ch)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1973 case LPAR:
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1974 if (TYPE(CHILD(n, 1)) == RPAR) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1975 com_addoparg(c, BUILD_TUPLE, 0);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1976 com_push(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1977 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1978 else
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	1979 com_testlist_gexp(c, CHILD(n, 1));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1980 break;
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1981 case LSQB: /* '[' [listmaker] ']' */
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1982 if (TYPE(CHILD(n, 1)) == RSQB) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1983 com_addoparg(c, BUILD_LIST, 0);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1984 com_push(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1985 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1986 else
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1987 com_listmaker(c, CHILD(n, 1));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1988 break;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1989 case LBRACE: /* '{' [dictmaker] '}' */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1990 com_addoparg(c, BUILD_MAP, 0);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1991 com_push(c, 1);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1992 if (TYPE(CHILD(n, 1)) == dictmaker)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1993 com_dictmaker(c, CHILD(n, 1));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1994 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1995 case BACKQUOTE:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1996 com_node(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1997 com_addbyte(c, UNARY_CONVERT);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1998 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1999 case NUMBER:
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	2000 if ((v = parsenumber(c, STR(ch))) == NULL) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2001 i = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2002 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2003 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2004 i = com_addconst(c, v);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2005 Py_DECREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2006 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2007 com_addoparg(c, LOAD_CONST, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2008 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2009 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2010 case STRING:
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	2011 v = parsestrplus(c, n);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	2012 if (v == NULL) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2013 c->c_errors++;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2014 i = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2015 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2016 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2017 i = com_addconst(c, v);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2018 Py_DECREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2019 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2020 com_addoparg(c, LOAD_CONST, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2021 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2022 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2023 case NAME:
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2024 com_addop_varname(c, VAR_LOAD, STR(ch));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2025 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2026 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2027 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2028 com_error(c, PyExc_SystemError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2029 "com_atom: unexpected node type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2030 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2031 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2032
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2033 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2034 com_slice(struct compiling c, node n, int op)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2035 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2036 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2037 com_addbyte(c, op);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2038 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2039 else if (NCH(n) == 2) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2040 if (TYPE(CHILD(n, 0)) != COLON) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2041 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2042 com_addbyte(c, op+1);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2043 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2044 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2045 com_node(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2046 com_addbyte(c, op+2);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2047 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2048 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2049 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2050 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2051 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2052 com_node(c, CHILD(n, 2));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2053 com_addbyte(c, op+3);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2054 com_pop(c, 2);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2055 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2056 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2057
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2058 static void
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2059 com_augassign_slice(struct compiling c, node n, int opcode, node *augn)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2060 {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2061 if (NCH(n) == 1) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2062 com_addbyte(c, DUP_TOP);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2063 com_push(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2064 com_addbyte(c, SLICE);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2065 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2066 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2067 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2068 com_addbyte(c, ROT_TWO);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2069 com_addbyte(c, STORE_SLICE);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2070 com_pop(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2071 } else if (NCH(n) == 2 && TYPE(CHILD(n, 0)) != COLON) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2072 com_node(c, CHILD(n, 0));
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2073 com_addoparg(c, DUP_TOPX, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2074 com_push(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2075 com_addbyte(c, SLICE+1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2076 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2077 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2078 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2079 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2080 com_addbyte(c, ROT_THREE);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2081 com_addbyte(c, STORE_SLICE+1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2082 com_pop(c, 3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2083 } else if (NCH(n) == 2) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2084 com_node(c, CHILD(n, 1));
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2085 com_addoparg(c, DUP_TOPX, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2086 com_push(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2087 com_addbyte(c, SLICE+2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2088 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2089 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2090 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2091 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2092 com_addbyte(c, ROT_THREE);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2093 com_addbyte(c, STORE_SLICE+2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2094 com_pop(c, 3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2095 } else {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2096 com_node(c, CHILD(n, 0));
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2097 com_node(c, CHILD(n, 2));
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2098 com_addoparg(c, DUP_TOPX, 3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2099 com_push(c, 3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2100 com_addbyte(c, SLICE+3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2101 com_pop(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2102 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2103 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2104 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2105 com_addbyte(c, ROT_FOUR);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2106 com_addbyte(c, STORE_SLICE+3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2107 com_pop(c, 4);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2108 }
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2109 }
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2110
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2111 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2112 com_argument(struct compiling c, node n, PyObject **pkeywords)
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2113 {
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2114 node *m;
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	2115 REQ(n, argument); /* [test '='] test [gen_for]; really [keyword '='] test */
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2116 if (NCH(n) == 1) {
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2117 if (*pkeywords != NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2118 com_error(c, PyExc_SyntaxError,
13993 716e1c4e3f78 When raising a SyntaxError, make a best-effort attempt to set the Fred Drake <fdrake@acm.org> parents: 13956 diff changeset	2119 "non-keyword arg after keyword arg");
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2120 }
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2121 else {
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2122 com_node(c, CHILD(n, 0));
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2123 }
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2124 return;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2125 }
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	2126 if (NCH(n) == 2) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	2127 com_generator_expression(c, n);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	2128 return;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	2129 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	2130
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2131 m = n;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2132 do {
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2133 m = CHILD(m, 0);
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2134 } while (NCH(m) == 1);
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2135 if (TYPE(m) != NAME) {
16658 1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	2136 /* f(lambda x: x[0] = 3) ends up getting parsed with
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	2137 * LHS test = lambda x: x[0], and RHS test = 3.
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	2138 * SF bug 132313 points out that complaining about a keyword
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	2139 * then is very confusing.
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	2140 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2141 com_error(c, PyExc_SyntaxError,
16658 1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	2142 TYPE(m) == lambdef ?
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	2143 "lambda cannot contain assignment" :
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	2144 "keyword can't be an expression");
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2145 }
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2146 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2147 PyObject *v = PyString_InternFromString(STR(m));
24856 87448a228cca Add warning for None used as keyword argument name in function call. Guido van Rossum <guido@python.org> parents: 24855 diff changeset	2148 (void) none_assignment_check(c, STR(m), 1);
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2149 if (v != NULL && *pkeywords == NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2150 *pkeywords = PyDict_New();
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	2151 if (v == NULL)
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2152 c->c_errors++;
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	2153 else if (*pkeywords == NULL) {
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	2154 c->c_errors++;
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	2155 Py_DECREF(v);
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	2156 } else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2157 if (PyDict_GetItem(*pkeywords, v) != NULL)
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2158 com_error(c, PyExc_SyntaxError,
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2159 "duplicate keyword argument");
32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2160 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2161 if (PyDict_SetItem(*pkeywords, v, v) != 0)
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2162 c->c_errors++;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2163 com_addoparg(c, LOAD_CONST, com_addconst(c, v));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2164 com_push(c, 1);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2165 Py_DECREF(v);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2166 }
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2167 }
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2168 com_node(c, CHILD(n, 2));
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2169 }
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2170
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2171 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2172 com_call_function(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2173 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2174 if (TYPE(n) == RPAR) {
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2175 com_addoparg(c, CALL_FUNCTION, 0);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2176 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2177 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2178 PyObject *keywords = NULL;
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2179 int i, na, nk;
9625 1fe48009d8ea Add more SET_LINENO instructions in long argument lists Guido van Rossum <guido@python.org> parents: 9293 diff changeset	2180 int lineno = n->n_lineno;
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2181 int star_flag = 0;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2182 int starstar_flag = 0;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2183 int opcode;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2184 REQ(n, arglist);
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2185 na = 0;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2186 nk = 0;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2187 for (i = 0; i < NCH(n); i += 2) {
9625 1fe48009d8ea Add more SET_LINENO instructions in long argument lists Guido van Rossum <guido@python.org> parents: 9293 diff changeset	2188 node *ch = CHILD(n, i);
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2189 if (TYPE(ch) == STAR \|\|
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2190 TYPE(ch) == DOUBLESTAR)
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2191 break;
9625 1fe48009d8ea Add more SET_LINENO instructions in long argument lists Guido van Rossum <guido@python.org> parents: 9293 diff changeset	2192 if (ch->n_lineno != lineno) {
1fe48009d8ea Add more SET_LINENO instructions in long argument lists Guido van Rossum <guido@python.org> parents: 9293 diff changeset	2193 lineno = ch->n_lineno;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	2194 com_set_lineno(c, lineno);
9625 1fe48009d8ea Add more SET_LINENO instructions in long argument lists Guido van Rossum <guido@python.org> parents: 9293 diff changeset	2195 }
1fe48009d8ea Add more SET_LINENO instructions in long argument lists Guido van Rossum <guido@python.org> parents: 9293 diff changeset	2196 com_argument(c, ch, &keywords);
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2197 if (keywords == NULL)
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2198 na++;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2199 else
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2200 nk++;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2201 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2202 Py_XDECREF(keywords);
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2203 while (i < NCH(n)) {
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2204 node *tok = CHILD(n, i);
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2205 node *ch = CHILD(n, i+1);
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2206 i += 3;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2207 switch (TYPE(tok)) {
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2208 case STAR: star_flag = 1; break;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2209 case DOUBLESTAR: starstar_flag = 1; break;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2210 }
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2211 com_node(c, ch);
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2212 }
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2213 if (na > 255 \|\| nk > 255) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2214 com_error(c, PyExc_SyntaxError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2215 "more than 255 arguments");
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	2216 }
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2217 if (star_flag \|\| starstar_flag)
12086 96ea1a800b23 remove reference (vestigal) to CALL_FUNCTION_STAR Jeremy Hylton <jeremy@alum.mit.edu> parents: 12082 diff changeset	2218 opcode = CALL_FUNCTION_VAR - 1 +
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2219 star_flag + (starstar_flag << 1);
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2220 else
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2221 opcode = CALL_FUNCTION;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2222 com_addoparg(c, opcode, na \| (nk << 8));
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	2223 com_pop(c, na + 2*nk + star_flag + starstar_flag);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2224 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2225 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2226
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2227 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2228 com_select_member(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2229 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2230 com_addopname(c, LOAD_ATTR, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2231 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2232
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2233 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2234 com_sliceobj(struct compiling c, node n)
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2235 {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2236 int i=0;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2237 int ns=2; /* number of slice arguments */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2238 node *ch;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2239
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2240 /* first argument */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2241 if (TYPE(CHILD(n,i)) == COLON) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2242 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2243 com_push(c, 1);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2244 i++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2245 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2246 else {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2247 com_node(c, CHILD(n,i));
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2248 i++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2249 REQ(CHILD(n,i),COLON);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2250 i++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2251 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2252 /* second argument */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2253 if (i < NCH(n) && TYPE(CHILD(n,i)) == test) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2254 com_node(c, CHILD(n,i));
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2255 i++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2256 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2257 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2258 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2259 com_push(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2260 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2261 /* remaining arguments */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2262 for (; i < NCH(n); i++) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2263 ns++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2264 ch=CHILD(n,i);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2265 REQ(ch, sliceop);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2266 if (NCH(ch) == 1) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2267 /* right argument of ':' missing */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2268 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2269 com_push(c, 1);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2270 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2271 else
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2272 com_node(c, CHILD(ch,1));
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2273 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2274 com_addoparg(c, BUILD_SLICE, ns);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2275 com_pop(c, 1 + (ns == 3));
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2276 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2277
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2278 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2279 com_subscript(struct compiling c, node n)
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2280 {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2281 node *ch;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2282 REQ(n, subscript);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2283 ch = CHILD(n,0);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2284 /* check for rubber index */
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2285 if (TYPE(ch) == DOT && TYPE(CHILD(n,1)) == DOT) {
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 4315 diff changeset	2286 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_Ellipsis));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2287 com_push(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2288 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2289 else {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2290 /* check for slice */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2291 if ((TYPE(ch) == COLON \|\| NCH(n) > 1))
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2292 com_sliceobj(c, n);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2293 else {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2294 REQ(ch, test);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2295 com_node(c, ch);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2296 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2297 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2298 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2299
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2300 static void
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2301 com_subscriptlist(struct compiling c, node n, int assigning, node *augn)
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2302 {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2303 int i, op;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2304 REQ(n, subscriptlist);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2305 /* Check to make backward compatible slice behavior for '[i:j]' */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2306 if (NCH(n) == 1) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2307 node sub = CHILD(n, 0); / subscript */
13873 d014c8ab6a82 Fix some strange indentation and grammar that have been bugging me for Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	2308 /* 'Basic' slice, should have exactly one colon. */
d014c8ab6a82 Fix some strange indentation and grammar that have been bugging me for Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	2309 if ((TYPE(CHILD(sub, 0)) == COLON
d014c8ab6a82 Fix some strange indentation and grammar that have been bugging me for Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	2310 \|\| (NCH(sub) > 1 && TYPE(CHILD(sub, 1)) == COLON))
d014c8ab6a82 Fix some strange indentation and grammar that have been bugging me for Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	2311 && (TYPE(CHILD(sub,NCH(sub)-1)) != sliceop))
d014c8ab6a82 Fix some strange indentation and grammar that have been bugging me for Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	2312 {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2313 switch (assigning) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2314 case OP_DELETE:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2315 op = DELETE_SLICE;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2316 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2317 case OP_ASSIGN:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2318 op = STORE_SLICE;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2319 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2320 case OP_APPLY:
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2321 op = SLICE;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2322 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2323 default:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2324 com_augassign_slice(c, sub, assigning, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2325 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2326 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2327 com_slice(c, sub, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2328 if (op == STORE_SLICE)
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2329 com_pop(c, 2);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2330 else if (op == DELETE_SLICE)
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2331 com_pop(c, 1);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2332 return;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2333 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2334 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2335 /* Else normal subscriptlist. Compile each subscript. */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2336 for (i = 0; i < NCH(n); i += 2)
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2337 com_subscript(c, CHILD(n, i));
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2338 /* Put multiple subscripts into a tuple */
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2339 if (NCH(n) > 1) {
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2340 i = (NCH(n)+1) / 2;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2341 com_addoparg(c, BUILD_TUPLE, i);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2342 com_pop(c, i-1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2343 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2344 switch (assigning) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2345 case OP_DELETE:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2346 op = DELETE_SUBSCR;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2347 i = 2;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2348 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2349 default:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2350 case OP_ASSIGN:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2351 op = STORE_SUBSCR;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2352 i = 3;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2353 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2354 case OP_APPLY:
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2355 op = BINARY_SUBSCR;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2356 i = 1;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2357 break;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2358 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2359 if (assigning > OP_APPLY) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2360 com_addoparg(c, DUP_TOPX, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2361 com_push(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2362 com_addbyte(c, BINARY_SUBSCR);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2363 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2364 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2365 com_addbyte(c, assigning);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2366 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2367 com_addbyte(c, ROT_THREE);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2368 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2369 com_addbyte(c, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2370 com_pop(c, i);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2371 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2372
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2373 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2374 com_apply_trailer(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2375 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2376 REQ(n, trailer);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2377 switch (TYPE(CHILD(n, 0))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2378 case LPAR:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2379 com_call_function(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2380 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2381 case DOT:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2382 com_select_member(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2383 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2384 case LSQB:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2385 com_subscriptlist(c, CHILD(n, 1), OP_APPLY, NULL);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2386 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2387 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2388 com_error(c, PyExc_SystemError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	2389 "com_apply_trailer: unknown trailer type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2390 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2391 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2392
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2393 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2394 com_power(struct compiling c, node n)
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2395 {
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2396 int i;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2397 REQ(n, power);
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2398 com_atom(c, CHILD(n, 0));
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2399 for (i = 1; i < NCH(n); i++) {
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2400 if (TYPE(CHILD(n, i)) == DOUBLESTAR) {
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2401 com_factor(c, CHILD(n, i+1));
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2402 com_addbyte(c, BINARY_POWER);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2403 com_pop(c, 1);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2404 break;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2405 }
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2406 else
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2407 com_apply_trailer(c, CHILD(n, i));
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2408 }
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2409 }
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2410
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2411 static void
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2412 com_invert_constant(struct compiling c, node n)
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2413 {
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2414 /* Compute the inverse of int and longs and use them directly,
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2415 but be prepared to generate code for all other
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2416 possibilities (invalid numbers, floats, complex).
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2417 */
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2418 PyObject num, inv = NULL;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2419 int i;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2420
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2421 REQ(n, NUMBER);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2422 num = parsenumber(c, STR(n));
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2423 if (num == NULL)
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2424 i = 255;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2425 else {
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2426 inv = PyNumber_Invert(num);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2427 if (inv == NULL) {
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2428 PyErr_Clear();
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2429 i = com_addconst(c, num);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2430 } else {
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2431 i = com_addconst(c, inv);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2432 Py_DECREF(inv);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2433 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2434 Py_DECREF(num);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2435 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2436 com_addoparg(c, LOAD_CONST, i);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2437 com_push(c, 1);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2438 if (num != NULL && inv == NULL)
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2439 com_addbyte(c, UNARY_INVERT);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2440 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2441
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2442 static int
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2443 is_float_zero(const char *p)
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2444 {
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2445 int found_radix_point = 0;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2446 int ch;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2447 while ((ch = Py_CHARMASK(*p++)) != '\0') {
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2448 switch (ch) {
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2449 case '0':
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2450 /* no reason to believe it's not 0 -- continue */
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2451 break;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2452
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2453 case 'e': case 'E': case 'j': case 'J':
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2454 /* If this was a hex constant, we already would have
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2455 returned 0 due to the 'x' or 'X', so 'e' or 'E'
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2456 must be an exponent marker, and we haven't yet
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2457 seen a non-zero digit, and it doesn't matter what
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2458 the exponent is then. For 'j' or 'J' similarly,
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2459 except that this is an imaginary 0 then. */
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2460 return 1;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2461
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2462 case '.':
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2463 found_radix_point = 1;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2464 break;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2465
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2466 default:
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2467 return 0;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2468 }
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2469 }
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2470 return found_radix_point;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2471 }
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2472
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2473 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2474 com_factor(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2475 {
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2476 int childtype = TYPE(CHILD(n, 0));
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2477 node pfactor, ppower, patom, pnum;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2478 REQ(n, factor);
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2479 /* If the unary +, -, or ~ operator is applied to a constant,
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2480 don't generate a UNARY_xxx opcode. Just store the
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2481 approriate value as a constant. If the value is negative,
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2482 extend the string containing the constant and insert a
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2483 negative in the 0th position -- unless we're doing unary minus
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2484 of a floating zero! In that case the sign is significant, but
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2485 the const dict can't distinguish +0.0 from -0.0.
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2486 */
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2487 if ((childtype == PLUS \|\| childtype == MINUS \|\| childtype == TILDE)
19613 f7cf8961c667 When re-writing a factor containing a unary negation of a literal, only Fred Drake <fdrake@acm.org> parents: 19601 diff changeset	2488 && NCH(n) == 2
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2489 && TYPE((pfactor = CHILD(n, 1))) == factor
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2490 && NCH(pfactor) == 1
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2491 && TYPE((ppower = CHILD(pfactor, 0))) == power
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2492 && NCH(ppower) == 1
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2493 && TYPE((patom = CHILD(ppower, 0))) == atom
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2494 && TYPE((pnum = CHILD(patom, 0))) == NUMBER
27846 e9d7102f8278 SF #660455 : patch by NNorwitz. Guido van Rossum <guido@python.org> parents: 27781 diff changeset	2495 && !(childtype == MINUS &&
e9d7102f8278 SF #660455 : patch by NNorwitz. Guido van Rossum <guido@python.org> parents: 27781 diff changeset	2496 (STR(pnum)[0] == '0' \|\| is_float_zero(STR(pnum))))) {
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2497 if (childtype == TILDE) {
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2498 com_invert_constant(c, pnum);
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2499 return;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2500 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2501 if (childtype == MINUS) {
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	2502 char *s = PyObject_MALLOC(strlen(STR(pnum)) + 2);
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2503 if (s == NULL) {
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2504 com_error(c, PyExc_MemoryError, "");
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2505 com_addbyte(c, 255);
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2506 return;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2507 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2508 s[0] = '-';
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2509 strcpy(s + 1, STR(pnum));
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	2510 PyObject_FREE(STR(pnum));
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2511 STR(pnum) = s;
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2512 }
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2513 com_atom(c, patom);
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2514 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2515 else if (childtype == PLUS) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2516 com_factor(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2517 com_addbyte(c, UNARY_POSITIVE);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2518 }
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2519 else if (childtype == MINUS) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2520 com_factor(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2521 com_addbyte(c, UNARY_NEGATIVE);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2522 }
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2523 else if (childtype == TILDE) {
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2524 com_factor(c, CHILD(n, 1));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2525 com_addbyte(c, UNARY_INVERT);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2526 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2527 else {
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2528 com_power(c, CHILD(n, 0));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2529 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2530 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2531
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2532 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2533 com_term(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2534 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2535 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2536 int op;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2537 REQ(n, term);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2538 com_factor(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2539 for (i = 2; i < NCH(n); i += 2) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2540 com_factor(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2541 switch (TYPE(CHILD(n, i-1))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2542 case STAR:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2543 op = BINARY_MULTIPLY;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2544 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2545 case SLASH:
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2546 if (c->c_flags & CO_FUTURE_DIVISION)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2547 op = BINARY_TRUE_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2548 else
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2549 op = BINARY_DIVIDE;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2550 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2551 case PERCENT:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2552 op = BINARY_MODULO;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2553 break;
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2554 case DOUBLESLASH:
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2555 op = BINARY_FLOOR_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2556 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2557 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2558 com_error(c, PyExc_SystemError,
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2559 "com_term: operator not *, /, // or %");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2560 op = 255;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2561 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2562 com_addbyte(c, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2563 com_pop(c, 1);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2564 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2565 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2566
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2567 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2568 com_arith_expr(struct compiling c, node n)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2569 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2570 int i;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2571 int op;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2572 REQ(n, arith_expr);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2573 com_term(c, CHILD(n, 0));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2574 for (i = 2; i < NCH(n); i += 2) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2575 com_term(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2576 switch (TYPE(CHILD(n, i-1))) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2577 case PLUS:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2578 op = BINARY_ADD;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2579 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2580 case MINUS:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2581 op = BINARY_SUBTRACT;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2582 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2583 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2584 com_error(c, PyExc_SystemError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	2585 "com_arith_expr: operator not + or -");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2586 op = 255;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2587 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2588 com_addbyte(c, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2589 com_pop(c, 1);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2590 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2591 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2592
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2593 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2594 com_shift_expr(struct compiling c, node n)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2595 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2596 int i;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2597 int op;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2598 REQ(n, shift_expr);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2599 com_arith_expr(c, CHILD(n, 0));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2600 for (i = 2; i < NCH(n); i += 2) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2601 com_arith_expr(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2602 switch (TYPE(CHILD(n, i-1))) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2603 case LEFTSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2604 op = BINARY_LSHIFT;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2605 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2606 case RIGHTSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2607 op = BINARY_RSHIFT;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2608 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2609 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2610 com_error(c, PyExc_SystemError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	2611 "com_shift_expr: operator not << or >>");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2612 op = 255;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2613 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2614 com_addbyte(c, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2615 com_pop(c, 1);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2616 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2617 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2618
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2619 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2620 com_and_expr(struct compiling c, node n)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2621 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2622 int i;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2623 int op;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2624 REQ(n, and_expr);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2625 com_shift_expr(c, CHILD(n, 0));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2626 for (i = 2; i < NCH(n); i += 2) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2627 com_shift_expr(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2628 if (TYPE(CHILD(n, i-1)) == AMPER) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2629 op = BINARY_AND;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2630 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2631 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2632 com_error(c, PyExc_SystemError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	2633 "com_and_expr: operator not &");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2634 op = 255;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2635 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2636 com_addbyte(c, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2637 com_pop(c, 1);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2638 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2639 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2640
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2641 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2642 com_xor_expr(struct compiling c, node n)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2643 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2644 int i;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2645 int op;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2646 REQ(n, xor_expr);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2647 com_and_expr(c, CHILD(n, 0));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2648 for (i = 2; i < NCH(n); i += 2) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2649 com_and_expr(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2650 if (TYPE(CHILD(n, i-1)) == CIRCUMFLEX) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2651 op = BINARY_XOR;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2652 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2653 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2654 com_error(c, PyExc_SystemError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	2655 "com_xor_expr: operator not ^");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2656 op = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2657 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2658 com_addbyte(c, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2659 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2660 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2661 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2662
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2663 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2664 com_expr(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2665 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2666 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2667 int op;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2668 REQ(n, expr);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2669 com_xor_expr(c, CHILD(n, 0));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2670 for (i = 2; i < NCH(n); i += 2) {
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2671 com_xor_expr(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2672 if (TYPE(CHILD(n, i-1)) == VBAR) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2673 op = BINARY_OR;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2674 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2675 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2676 com_error(c, PyExc_SystemError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	2677 "com_expr: expr operator not \|");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2678 op = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2679 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2680 com_addbyte(c, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2681 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2682 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2683 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2684
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2685 static enum cmp_op
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2686 cmp_type(node *n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2687 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2688 REQ(n, comp_op);
29084 ce1d7e10f49e cmp_type(): The grammar stopped allowing '=' as a comparison operator Tim Peters <tim.peters@gmail.com> parents: 29066 diff changeset	2689 /* comp_op: '<' \| '>' \| '>=' \| '<=' \| '<>' \| '!=' \| '=='
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2690 \| 'in' \| 'not' 'in' \| 'is' \| 'is' not' */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2691 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2692 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2693 switch (TYPE(n)) {
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2694 case LESS: return PyCmp_LT;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2695 case GREATER: return PyCmp_GT;
29084 ce1d7e10f49e cmp_type(): The grammar stopped allowing '=' as a comparison operator Tim Peters <tim.peters@gmail.com> parents: 29066 diff changeset	2696 case EQEQUAL: return PyCmp_EQ;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2697 case LESSEQUAL: return PyCmp_LE;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2698 case GREATEREQUAL: return PyCmp_GE;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2699 case NOTEQUAL: return PyCmp_NE; /* <> or != */
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2700 case NAME: if (strcmp(STR(n), "in") == 0) return PyCmp_IN;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2701 if (strcmp(STR(n), "is") == 0) return PyCmp_IS;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2702 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2703 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2704 else if (NCH(n) == 2) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2705 switch (TYPE(CHILD(n, 0))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2706 case NAME: if (strcmp(STR(CHILD(n, 1)), "in") == 0)
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2707 return PyCmp_NOT_IN;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2708 if (strcmp(STR(CHILD(n, 0)), "is") == 0)
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2709 return PyCmp_IS_NOT;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2710 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2711 }
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2712 return PyCmp_BAD;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2713 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2714
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2715 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2716 com_comparison(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2717 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2718 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2719 enum cmp_op op;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2720 int anchor;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2721 REQ(n, comparison); /* comparison: expr (comp_op expr)* */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2722 com_expr(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2723 if (NCH(n) == 1)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2724 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2725
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2726 /****************************************************************
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2727 The following code is generated for all but the last
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2728 comparison in a chain:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2729
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2730 label: on stack: opcode: jump to:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2731
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2732 a <code to load b>
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2733 a, b DUP_TOP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2734 a, b, b ROT_THREE
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2735 b, a, b COMPARE_OP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2736 b, 0-or-1 JUMP_IF_FALSE L1
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2737 b, 1 POP_TOP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2738 b
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2739
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2740 We are now ready to repeat this sequence for the next
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2741 comparison in the chain.
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2742
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2743 For the last we generate:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2744
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2745 b <code to load c>
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2746 b, c COMPARE_OP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2747 0-or-1
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2748
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2749 If there were any jumps to L1 (i.e., there was more than one
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2750 comparison), we generate:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2751
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2752 0-or-1 JUMP_FORWARD L2
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2753 L1: b, 0 ROT_TWO
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2754 0, b POP_TOP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2755 0
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2756 L2: 0-or-1
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2757 ****************************************************************/
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2758
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2759 anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2760
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2761 for (i = 2; i < NCH(n); i += 2) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2762 com_expr(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2763 if (i+2 < NCH(n)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2764 com_addbyte(c, DUP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2765 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2766 com_addbyte(c, ROT_THREE);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2767 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2768 op = cmp_type(CHILD(n, i-1));
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2769 if (op == PyCmp_BAD) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2770 com_error(c, PyExc_SystemError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	2771 "com_comparison: unknown comparison op");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2772 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2773 com_addoparg(c, COMPARE_OP, op);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2774 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2775 if (i+2 < NCH(n)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2776 com_addfwref(c, JUMP_IF_FALSE, &anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2777 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2778 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2779 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2780 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2781
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2782 if (anchor) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2783 int anchor2 = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2784 com_addfwref(c, JUMP_FORWARD, &anchor2);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2785 com_backpatch(c, anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2786 com_addbyte(c, ROT_TWO);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2787 com_addbyte(c, POP_TOP);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2788 com_backpatch(c, anchor2);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2789 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2790 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2791
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2792 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2793 com_not_test(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2794 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2795 REQ(n, not_test); /* 'not' not_test \| comparison */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2796 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2797 com_comparison(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2798 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2799 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2800 com_not_test(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2801 com_addbyte(c, UNARY_NOT);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2802 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2803 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2804
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2805 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2806 com_and_test(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2807 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2808 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2809 int anchor;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2810 REQ(n, and_test); /* not_test ('and' not_test)* */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2811 anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2812 i = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2813 for (;;) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2814 com_not_test(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2815 if ((i += 2) >= NCH(n))
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2816 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2817 com_addfwref(c, JUMP_IF_FALSE, &anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2818 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2819 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2820 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2821 if (anchor)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2822 com_backpatch(c, anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2823 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2824
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2825 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2826 com_make_closure(struct compiling c, PyCodeObject co)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2827 {
21398 de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21179 diff changeset	2828 int i, free = PyCode_GetNumFree(co);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2829 if (free == 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2830 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2831 for (i = 0; i < free; ++i) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2832 /* Bypass com_addop_varname because it will generate
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2833 LOAD_DEREF but LOAD_CLOSURE is needed.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2834 */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2835 PyObject *name = PyTuple_GET_ITEM(co->co_freevars, i);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2836 int arg, reftype;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2837
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2838 /* Special case: If a class contains a method with a
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2839 free variable that has the same name as a method,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2840 the name will be considered free and local in the
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2841 class. It should be handled by the closure, as
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2842 well as by the normal name loookup logic.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2843 */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2844 reftype = get_ref_type(c, PyString_AS_STRING(name));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2845 if (reftype == CELL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2846 arg = com_lookup_arg(c->c_cellvars, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2847 else /* (reftype == FREE) */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2848 arg = com_lookup_arg(c->c_freevars, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2849 if (arg == -1) {
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2850 fprintf(stderr, "lookup %s in %s %d %d\n"
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2851 "freevars of %s: %s\n",
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2852 PyObject_REPR(name),
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2853 c->c_name,
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2854 reftype, arg,
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2855 PyString_AS_STRING(co->co_name),
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2856 PyObject_REPR(co->co_freevars));
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2857 Py_FatalError("com_make_closure()");
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2858 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2859 com_addoparg(c, LOAD_CLOSURE, arg);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2860
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2861 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2862 com_push(c, free);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2863 return 1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2864 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2865
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2866 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2867 com_test(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2868 {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2869 REQ(n, test); /* and_test ('or' and_test)* \| lambdef */
1417 f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2870 if (NCH(n) == 1 && TYPE(CHILD(n, 0)) == lambdef) {
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	2871 PyCodeObject *co;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2872 int i, closure;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2873 int ndefs = com_argdefs(c, CHILD(n, 0));
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	2874 symtable_enter_scope(c->c_symtable, "lambda", lambdef,
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	2875 n->n_lineno);
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	2876 co = icompile(CHILD(n, 0), c);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	2877 if (co == NULL) {
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	2878 c->c_errors++;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	2879 return;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	2880 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2881 symtable_exit_scope(c->c_symtable);
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	2882 i = com_addconst(c, (PyObject *)co);
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	2883 closure = com_make_closure(c, co);
1417 f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2884 com_addoparg(c, LOAD_CONST, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2885 com_push(c, 1);
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	2886 if (closure) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2887 com_addoparg(c, MAKE_CLOSURE, ndefs);
21398 de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21179 diff changeset	2888 com_pop(c, PyCode_GetNumFree(co));
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	2889 } else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2890 com_addoparg(c, MAKE_FUNCTION, ndefs);
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	2891 Py_DECREF(co);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2892 com_pop(c, ndefs);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2893 }
1417 f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2894 else {
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2895 int anchor = 0;
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2896 int i = 0;
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2897 for (;;) {
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2898 com_and_test(c, CHILD(n, i));
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2899 if ((i += 2) >= NCH(n))
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2900 break;
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2901 com_addfwref(c, JUMP_IF_TRUE, &anchor);
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2902 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2903 com_pop(c, 1);
1417 f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2904 }
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2905 if (anchor)
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2906 com_backpatch(c, anchor);
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2907 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2908 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2909
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2910 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2911 com_list(struct compiling c, node n, int toplevel)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2912 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2913 /* exprlist: expr (',' expr)* [',']; likewise for testlist */
482 ee899a81570d New argument passing. Guido van Rossum <guido@python.org> parents: 466 diff changeset	2914 if (NCH(n) == 1 && !toplevel) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2915 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2916 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2917 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2918 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2919 int len;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2920 len = (NCH(n) + 1) / 2;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2921 for (i = 0; i < NCH(n); i += 2)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2922 com_node(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2923 com_addoparg(c, BUILD_TUPLE, len);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2924 com_pop(c, len-1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2925 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2926 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2927
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2928
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2929 /* Begin of assignment compilation */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2930
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2931
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2932 static void
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2933 com_augassign_attr(struct compiling c, node n, int opcode, node *augn)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2934 {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2935 com_addbyte(c, DUP_TOP);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2936 com_push(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2937 com_addopname(c, LOAD_ATTR, n);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2938 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2939 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2940 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2941 com_addbyte(c, ROT_TWO);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2942 com_addopname(c, STORE_ATTR, n);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2943 com_pop(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2944 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2945
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2946 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2947 com_assign_attr(struct compiling c, node n, int assigning)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2948 {
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	2949 if (none_assignment_check(c, STR(n), assigning))
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	2950 return;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2951 com_addopname(c, assigning ? STORE_ATTR : DELETE_ATTR, n);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2952 com_pop(c, assigning ? 2 : 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2953 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2954
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2955 static void
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2956 com_assign_trailer(struct compiling c, node n, int assigning, node *augn)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2957 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2958 REQ(n, trailer);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2959 switch (TYPE(CHILD(n, 0))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2960 case LPAR: /* '(' [exprlist] ')' */
23589 b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2961 if (assigning == OP_DELETE)
b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2962 com_error(c, PyExc_SyntaxError,
b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2963 "can't delete function call");
b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2964 else
b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2965 com_error(c, PyExc_SyntaxError,
b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2966 "can't assign to function call");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2967 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2968 case DOT: /* '.' NAME */
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2969 if (assigning > OP_APPLY)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2970 com_augassign_attr(c, CHILD(n, 1), assigning, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2971 else
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2972 com_assign_attr(c, CHILD(n, 1), assigning);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2973 break;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2974 case LSQB: /* '[' subscriptlist ']' */
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2975 com_subscriptlist(c, CHILD(n, 1), assigning, augn);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2976 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2977 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2978 com_error(c, PyExc_SystemError, "unknown trailer type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2979 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2980 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2981
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2982 static void
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13884 diff changeset	2983 com_assign_sequence(struct compiling c, node n, int assigning)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2984 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2985 int i;
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	2986 if (TYPE(n) != testlist && TYPE(n) != testlist_gexp &&
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	2987 TYPE(n) != listmaker)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2988 REQ(n, exprlist);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2989 if (assigning) {
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2990 i = (NCH(n)+1)/2;
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13884 diff changeset	2991 com_addoparg(c, UNPACK_SEQUENCE, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2992 com_push(c, i-1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2993 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2994 for (i = 0; i < NCH(n); i += 2)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2995 com_assign(c, CHILD(n, i), assigning, NULL);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2996 }
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2997
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2998 static void
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2999 com_augassign_name(struct compiling c, node n, int opcode, node *augn)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3000 {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3001 REQ(n, NAME);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3002 com_addop_varname(c, VAR_LOAD, STR(n));
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3003 com_push(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3004 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3005 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3006 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3007 com_assign_name(c, n, OP_ASSIGN);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3008 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3009
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3010 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3011 com_assign_name(struct compiling c, node n, int assigning)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3012 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3013 REQ(n, NAME);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3014 com_addop_varname(c, assigning ? VAR_STORE : VAR_DELETE, STR(n));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3015 if (assigning)
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3016 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3017 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3018
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3019 static void
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3020 com_assign(struct compiling c, node n, int assigning, node *augn)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3021 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3022 /* Loop to avoid trivial recursion */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3023 for (;;) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3024 switch (TYPE(n)) {
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3025
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3026 case exprlist:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3027 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	3028 case testlist1:
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	3029 case testlist_gexp:
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3030 if (NCH(n) > 1) {
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	3031 if (TYPE(CHILD(n, 1)) == gen_for) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	3032 com_error(c, PyExc_SystemError,
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	3033 "assign to generator expression not possible");
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	3034 return;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	3035 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3036 if (assigning > OP_APPLY) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3037 com_error(c, PyExc_SyntaxError,
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	3038 "augmented assign to tuple not possible");
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3039 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3040 }
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13884 diff changeset	3041 com_assign_sequence(c, n, assigning);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3042 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3043 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3044 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3045 break;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3046
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3047 case test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3048 case and_test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3049 case not_test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3050 case comparison:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3051 case expr:
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3052 case xor_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3053 case and_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3054 case shift_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3055 case arith_expr:
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3056 case term:
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3057 case factor:
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3058 if (NCH(n) > 1) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3059 com_error(c, PyExc_SyntaxError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	3060 "can't assign to operator");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3061 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3062 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3063 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3064 break;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3065
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	3066 case power: /* atom trailer* ('*' power)
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	3067 ('+'\|'-'\|'~') factor \| atom trailer* */
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3068 if (TYPE(CHILD(n, 0)) != atom) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3069 com_error(c, PyExc_SyntaxError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	3070 "can't assign to operator");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3071 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3072 }
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3073 if (NCH(n) > 1) { /* trailer or exponent present */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3074 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3075 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3076 for (i = 1; i+1 < NCH(n); i++) {
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3077 if (TYPE(CHILD(n, i)) == DOUBLESTAR) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3078 com_error(c, PyExc_SyntaxError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	3079 "can't assign to operator");
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3080 return;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3081 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3082 com_apply_trailer(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3083 } /* NB i is still alive */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3084 com_assign_trailer(c,
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3085 CHILD(n, i), assigning, augn);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3086 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3087 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3088 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3089 break;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3090
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3091 case atom:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3092 switch (TYPE(CHILD(n, 0))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3093 case LPAR:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3094 n = CHILD(n, 1);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3095 if (TYPE(n) == RPAR) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3096 /* XXX Should allow () = () ??? */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3097 com_error(c, PyExc_SyntaxError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	3098 "can't assign to ()");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3099 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3100 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3101 if (assigning > OP_APPLY) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3102 com_error(c, PyExc_SyntaxError,
29237 068529a90992 SF bug #644345, Poor error message for augmented assign Neal Norwitz <nnorwitz@gmail.com> parents: 29224 diff changeset	3103 "augmented assign to tuple literal not possible");
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3104 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3105 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3106 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3107 case LSQB:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3108 n = CHILD(n, 1);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3109 if (TYPE(n) == RSQB) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3110 com_error(c, PyExc_SyntaxError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	3111 "can't assign to []");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3112 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3113 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3114 if (assigning > OP_APPLY) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3115 com_error(c, PyExc_SyntaxError,
29237 068529a90992 SF bug #644345, Poor error message for augmented assign Neal Norwitz <nnorwitz@gmail.com> parents: 29224 diff changeset	3116 "augmented assign to list literal not possible");
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3117 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3118 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3119 if (NCH(n) > 1
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3120 && TYPE(CHILD(n, 1)) == list_for) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3121 com_error(c, PyExc_SyntaxError,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3122 "can't assign to list comprehension");
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3123 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3124 }
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13884 diff changeset	3125 com_assign_sequence(c, n, assigning);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3126 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3127 case NAME:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3128 if (assigning > OP_APPLY)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3129 com_augassign_name(c, CHILD(n, 0),
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3130 assigning, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3131 else
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3132 com_assign_name(c, CHILD(n, 0),
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3133 assigning);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3134 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3135 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3136 com_error(c, PyExc_SyntaxError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	3137 "can't assign to literal");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3138 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3139 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3140 break;
3963 00722990b80c Removed unused var; added error check for ``lambda: x=1''. Guido van Rossum <guido@python.org> parents: 3839 diff changeset	3141
00722990b80c Removed unused var; added error check for ``lambda: x=1''. Guido van Rossum <guido@python.org> parents: 3839 diff changeset	3142 case lambdef:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3143 com_error(c, PyExc_SyntaxError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3144 "can't assign to lambda");
3963 00722990b80c Removed unused var; added error check for ``lambda: x=1''. Guido van Rossum <guido@python.org> parents: 3839 diff changeset	3145 return;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3146
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3147 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3148 com_error(c, PyExc_SystemError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3149 "com_assign: bad node");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3150 return;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3151
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3152 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3153 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3154 }
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3155
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3156 static void
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3157 com_augassign(struct compiling c, node n)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3158 {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3159 int opcode;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3160
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3161 switch (STR(CHILD(CHILD(n, 1), 0))[0]) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3162 case '+': opcode = INPLACE_ADD; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3163 case '-': opcode = INPLACE_SUBTRACT; break;
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	3164 case '/':
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	3165 if (STR(CHILD(CHILD(n, 1), 0))[1] == '/')
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	3166 opcode = INPLACE_FLOOR_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	3167 else if (c->c_flags & CO_FUTURE_DIVISION)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	3168 opcode = INPLACE_TRUE_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	3169 else
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	3170 opcode = INPLACE_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	3171 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3172 case '%': opcode = INPLACE_MODULO; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3173 case '<': opcode = INPLACE_LSHIFT; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3174 case '>': opcode = INPLACE_RSHIFT; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3175 case '&': opcode = INPLACE_AND; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3176 case '^': opcode = INPLACE_XOR; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3177 case '\|': opcode = INPLACE_OR; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3178 case '*':
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3179 if (STR(CHILD(CHILD(n, 1), 0))[1] == '*')
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3180 opcode = INPLACE_POWER;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3181 else
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3182 opcode = INPLACE_MULTIPLY;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3183 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3184 default:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3185 com_error(c, PyExc_SystemError, "com_augassign: bad operator");
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3186 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3187 }
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3188 com_assign(c, CHILD(n, 0), opcode, CHILD(n, 2));
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3189 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3190
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3191 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3192 com_expr_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3193 {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3194 REQ(n, expr_stmt);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3195 /* testlist (('=' testlist)* \| augassign testlist) */
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3196 /* Forget it if we have just a doc string here */
5264 38878f1cd4f1 Support for alternative string quotes (a"xx", b"xx", c"xx", ...). Guido van Rossum <guido@python.org> parents: 5233 diff changeset	3197 if (!c->c_interactive && NCH(n) == 1 && get_rawdocstring(n) != NULL)
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3198 return;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3199 if (NCH(n) == 1) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3200 com_node(c, CHILD(n, NCH(n)-1));
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3201 if (c->c_interactive)
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3202 com_addbyte(c, PRINT_EXPR);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3203 else
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3204 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3205 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3206 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3207 else if (TYPE(CHILD(n,1)) == augassign)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3208 com_augassign(c, n);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3209 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3210 int i;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3211 com_node(c, CHILD(n, NCH(n)-1));
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3212 for (i = 0; i < NCH(n)-2; i+=2) {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3213 if (i+2 < NCH(n)-2) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3214 com_addbyte(c, DUP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3215 com_push(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3216 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3217 com_assign(c, CHILD(n, i), OP_ASSIGN, NULL);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3218 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3219 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3220 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3221
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3222 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3223 com_assert_stmt(struct compiling c, node n)
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3224 {
23280 9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	3225 int a = 0;
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3226 int i;
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3227 REQ(n, assert_stmt); /* 'assert' test [',' test] */
23280 9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	3228 if (Py_OptimizeFlag)
9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	3229 return;
9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	3230 /* Generate code like
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3231
23280 9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	3232 if not <test>:
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3233 raise AssertionError [, <message>]
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3234
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3235 where <message> is the second test, if present.
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3236 */
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3237 com_node(c, CHILD(n, 1));
23280 9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	3238 com_addfwref(c, JUMP_IF_TRUE, &a);
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3239 com_addbyte(c, POP_TOP);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3240 com_pop(c, 1);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3241 /* Raise that exception! */
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3242 com_addop_name(c, LOAD_GLOBAL, "AssertionError");
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3243 com_push(c, 1);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3244 i = NCH(n)/2; /* Either 2 or 4 */
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3245 if (i > 1)
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3246 com_node(c, CHILD(n, 3));
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3247 com_addoparg(c, RAISE_VARARGS, i);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3248 com_pop(c, i);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3249 /* The interpreter does not fall through */
23280 9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	3250 /* Jump ends up here */
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3251 com_backpatch(c, a);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3252 com_addbyte(c, POP_TOP);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3253 }
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3254
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3255 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3256 com_print_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3257 {
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3258 int i = 1;
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3259 node* stream = NULL;
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3260
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3261 REQ(n, print_stmt); /* 'print' (test ',')* [test] */
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3262
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3263 /* are we using the extended print form? */
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3264 if (NCH(n) >= 2 && TYPE(CHILD(n, 1)) == RIGHTSHIFT) {
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3265 stream = CHILD(n, 2);
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3266 com_node(c, stream);
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3267 /* stack: [...] => [... stream] */
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3268 com_push(c, 1);
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3269 if (NCH(n) > 3 && TYPE(CHILD(n, 3)) == COMMA)
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3270 i = 4;
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3271 else
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3272 i = 3;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3273 }
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3274 for (; i < NCH(n); i += 2) {
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3275 if (stream != NULL) {
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3276 com_addbyte(c, DUP_TOP);
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3277 /* stack: [stream] => [stream stream] */
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3278 com_push(c, 1);
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3279 com_node(c, CHILD(n, i));
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3280 /* stack: [stream stream] => [stream stream obj] */
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3281 com_addbyte(c, ROT_TWO);
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3282 /* stack: [stream stream obj] => [stream obj stream] */
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3283 com_addbyte(c, PRINT_ITEM_TO);
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3284 /* stack: [stream obj stream] => [stream] */
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3285 com_pop(c, 2);
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3286 }
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3287 else {
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3288 com_node(c, CHILD(n, i));
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3289 /* stack: [...] => [... obj] */
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3290 com_addbyte(c, PRINT_ITEM);
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3291 com_pop(c, 1);
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3292 }
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3293 }
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3294 /* XXX Alternatively, LOAD_CONST '\n' and then PRINT_ITEM */
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3295 if (TYPE(CHILD(n, NCH(n)-1)) == COMMA) {
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3296 if (stream != NULL) {
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3297 /* must pop the extra stream object off the stack */
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3298 com_addbyte(c, POP_TOP);
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3299 /* stack: [... stream] => [...] */
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3300 com_pop(c, 1);
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3301 }
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3302 }
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3303 else {
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3304 if (stream != NULL) {
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3305 /* this consumes the last stream object on stack */
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3306 com_addbyte(c, PRINT_NEWLINE_TO);
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	3307 /* stack: [... stream] => [...] */
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3308 com_pop(c, 1);
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3309 }
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3310 else
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3311 com_addbyte(c, PRINT_NEWLINE);
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	3312 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3313 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3314
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3315 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3316 com_return_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3317 {
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3318 REQ(n, return_stmt); /* 'return' [testlist] */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3319 if (!c->c_infunction) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3320 com_error(c, PyExc_SyntaxError, "'return' outside function");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3321 }
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3322 if (c->c_flags & CO_GENERATOR) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3323 if (NCH(n) > 1) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3324 com_error(c, PyExc_SyntaxError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3325 "'return' with argument inside generator");
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3326 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3327 }
18243 47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	3328 if (NCH(n) < 2) {
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	3329 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	3330 com_push(c, 1);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3331 }
18243 47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	3332 else
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	3333 com_node(c, CHILD(n, 1));
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	3334 com_addbyte(c, RETURN_VALUE);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3335 com_pop(c, 1);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3336 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3337
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3338 static void
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3339 com_yield_stmt(struct compiling c, node n)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3340 {
18228 4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3341 int i;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3342 REQ(n, yield_stmt); /* 'yield' testlist */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3343 if (!c->c_infunction) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3344 com_error(c, PyExc_SyntaxError, "'yield' outside function");
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3345 }
18228 4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3346
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3347 for (i = 0; i < c->c_nblocks; ++i) {
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3348 if (c->c_block[i] == SETUP_FINALLY) {
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3349 com_error(c, PyExc_SyntaxError,
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3350 "'yield' not allowed in a 'try' block "
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3351 "with a 'finally' clause");
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3352 return;
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3353 }
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	3354 }
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3355 com_node(c, CHILD(n, 1));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	3356 com_addbyte(c, YIELD_VALUE);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3357 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3358 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3359
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3360 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3361 com_raise_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3362 {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3363 int i;
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	3364 REQ(n, raise_stmt); /* 'raise' [test [',' test [',' test]]] */
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	3365 if (NCH(n) > 1) {
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	3366 com_node(c, CHILD(n, 1));
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	3367 if (NCH(n) > 3) {
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	3368 com_node(c, CHILD(n, 3));
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	3369 if (NCH(n) > 5)
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	3370 com_node(c, CHILD(n, 5));
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	3371 }
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	3372 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3373 i = NCH(n)/2;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3374 com_addoparg(c, RAISE_VARARGS, i);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3375 com_pop(c, i);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3376 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3377
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3378 static void
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3379 com_from_import(struct compiling c, node n)
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3380 {
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3381 com_addopname(c, IMPORT_FROM, CHILD(n, 0));
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3382 com_push(c, 1);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3383 if (NCH(n) > 1) {
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3384 if (strcmp(STR(CHILD(n, 1)), "as") != 0) {
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3385 com_error(c, PyExc_SyntaxError, "invalid syntax");
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3386 return;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3387 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3388 com_addop_varname(c, VAR_STORE, STR(CHILD(n, 2)));
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3389 } else
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3390 com_addop_varname(c, VAR_STORE, STR(CHILD(n, 0)));
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3391 com_pop(c, 1);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3392 }
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3393
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3394 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3395 com_import_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3396 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3397 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3398 REQ(n, import_stmt);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3399 /* 'import' dotted_name (',' dotted_name)* \|
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3400 'from' dotted_name 'import' ('' \| NAME (',' NAME)) */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3401 if (STR(CHILD(n, 0))[0] == 'f') {
15438 433458651eb4 Plug a memory leak in com_import_stmt(): the tuple created to hold the Guido van Rossum <guido@python.org> parents: 15408 diff changeset	3402 PyObject *tup;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3403 /* 'from' dotted_name 'import' ... */
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3404 REQ(CHILD(n, 1), dotted_name);
14232 1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3405
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3406 if (TYPE(CHILD(n, 3)) == STAR) {
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3407 tup = Py_BuildValue("(s)", "*");
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3408 } else {
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3409 tup = PyTuple_New((NCH(n) - 2)/2);
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3410 for (i = 3; i < NCH(n); i += 2) {
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3411 PyTuple_SET_ITEM(tup, (i-3)/2,
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	3412 PyString_FromString(STR(
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	3413 CHILD(CHILD(n, i), 0))));
14232 1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3414 }
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3415 }
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3416 com_addoparg(c, LOAD_CONST, com_addconst(c, tup));
15438 433458651eb4 Plug a memory leak in com_import_stmt(): the tuple created to hold the Guido van Rossum <guido@python.org> parents: 15408 diff changeset	3417 Py_DECREF(tup);
14232 1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3418 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3419 com_addopname(c, IMPORT_NAME, CHILD(n, 1));
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3420 if (TYPE(CHILD(n, 3)) == STAR)
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3421 com_addbyte(c, IMPORT_STAR);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3422 else {
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3423 for (i = 3; i < NCH(n); i += 2)
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3424 com_from_import(c, CHILD(n, i));
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3425 com_addbyte(c, POP_TOP);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3426 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3427 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3428 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3429 else {
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3430 /* 'import' ... */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3431 for (i = 1; i < NCH(n); i += 2) {
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3432 node *subn = CHILD(n, i);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3433 REQ(subn, dotted_as_name);
14232 1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3434 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	3435 com_push(c, 1);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3436 com_addopname(c, IMPORT_NAME, CHILD(subn, 0));
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3437 if (NCH(subn) > 1) {
14230 31925ab46b23 Re-allow 'import mod.submod as s', and change its meaning to what it should Thomas Wouters <thomas@python.org> parents: 14226 diff changeset	3438 int j;
31925ab46b23 Re-allow 'import mod.submod as s', and change its meaning to what it should Thomas Wouters <thomas@python.org> parents: 14226 diff changeset	3439 if (strcmp(STR(CHILD(subn, 1)), "as") != 0) {
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3440 com_error(c, PyExc_SyntaxError,
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3441 "invalid syntax");
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3442 return;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3443 }
14230 31925ab46b23 Re-allow 'import mod.submod as s', and change its meaning to what it should Thomas Wouters <thomas@python.org> parents: 14226 diff changeset	3444 for (j=2 ; j < NCH(CHILD(subn, 0)); j += 2)
31925ab46b23 Re-allow 'import mod.submod as s', and change its meaning to what it should Thomas Wouters <thomas@python.org> parents: 14226 diff changeset	3445 com_addopname(c, LOAD_ATTR,
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3446 CHILD(CHILD(subn, 0),
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3447 j));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3448 com_addop_varname(c, VAR_STORE,
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3449 STR(CHILD(subn, 2)));
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3450 } else
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3451 com_addop_varname(c, VAR_STORE,
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3452 STR(CHILD(CHILD(subn, 0),
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3453 0)));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3454 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3455 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3456 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3457 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3458
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3459 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3460 com_exec_stmt(struct compiling c, node n)
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3461 {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3462 REQ(n, exec_stmt);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3463 /* exec_stmt: 'exec' expr ['in' expr [',' expr]] */
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3464 com_node(c, CHILD(n, 1));
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3465 if (NCH(n) >= 4)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3466 com_node(c, CHILD(n, 3));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3467 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3468 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3469 com_push(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3470 }
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3471 if (NCH(n) >= 6)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3472 com_node(c, CHILD(n, 5));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3473 else {
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3474 com_addbyte(c, DUP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3475 com_push(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3476 }
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3477 com_addbyte(c, EXEC_STMT);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3478 com_pop(c, 3);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3479 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3480
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3481 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3482 is_constant_false(struct compiling c, node n)
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3483 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3484 PyObject *v;
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3485 int i;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3486 /* argument c will be NULL when called from symtable_node() */
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3487
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3488 /* Label to avoid tail recursion */
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3489 next:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3490 switch (TYPE(n)) {
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3491
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3492 case suite:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3493 if (NCH(n) == 1) {
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3494 n = CHILD(n, 0);
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3495 goto next;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3496 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3497 /* Fall through */
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3498 case file_input:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3499 for (i = 0; i < NCH(n); i++) {
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3500 node *ch = CHILD(n, i);
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3501 if (TYPE(ch) == stmt) {
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3502 n = ch;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3503 goto next;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3504 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3505 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3506 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3507
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3508 case stmt:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3509 case simple_stmt:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3510 case small_stmt:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3511 n = CHILD(n, 0);
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3512 goto next;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3513
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3514 case expr_stmt:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3515 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	3516 case testlist1:
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3517 case test:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3518 case and_test:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3519 case not_test:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3520 case comparison:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3521 case expr:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3522 case xor_expr:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3523 case and_expr:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3524 case shift_expr:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3525 case arith_expr:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3526 case term:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3527 case factor:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3528 case power:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3529 case atom:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3530 if (NCH(n) == 1) {
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3531 n = CHILD(n, 0);
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3532 goto next;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3533 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3534 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3535
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3536 case NAME:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3537 if (Py_OptimizeFlag && strcmp(STR(n), "__debug__") == 0)
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3538 return 1;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3539 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3540
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3541 case NUMBER:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3542 v = parsenumber(c, STR(n));
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3543 if (v == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3544 PyErr_Clear();
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3545 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3546 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3547 i = PyObject_IsTrue(v);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3548 Py_DECREF(v);
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3549 return i == 0;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3550
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3551 case STRING:
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	3552 v = parsestr(c, STR(n));
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3553 if (v == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3554 PyErr_Clear();
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3555 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3556 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3557 i = PyObject_IsTrue(v);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3558 Py_DECREF(v);
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3559 return i == 0;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3560
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3561 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3562 return 0;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3563 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3564
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3565
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3566 /* Look under n for a return stmt with an expression.
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3567 * This hack is used to find illegal returns under "if 0:" blocks in
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3568 * functions already known to be generators (as determined by the symtable
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3569 * pass).
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3570 * Return the offending return node if found, else NULL.
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3571 */
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3572 static node *
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3573 look_for_offending_return(node *n)
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3574 {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3575 int i;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3576
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3577 for (i = 0; i < NCH(n); ++i) {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3578 node *kid = CHILD(n, i);
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3579
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3580 switch (TYPE(kid)) {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3581 case classdef:
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3582 case funcdef:
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3583 case lambdef:
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3584 /* Stuff in nested functions & classes doesn't
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3585 affect the code block we started in. */
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3586 return NULL;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3587
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3588 case return_stmt:
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3589 if (NCH(kid) > 1)
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3590 return kid;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3591 break;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3592
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3593 default: {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3594 node *bad = look_for_offending_return(kid);
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3595 if (bad != NULL)
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3596 return bad;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3597 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3598 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3599 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3600
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3601 return NULL;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3602 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3603
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3604 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3605 com_if_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3606 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3607 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3608 int anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3609 REQ(n, if_stmt);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3610 /'if' test ':' suite ('elif' test ':' suite) ['else' ':' suite] */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3611 for (i = 0; i+3 < NCH(n); i+=4) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3612 int a = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3613 node *ch = CHILD(n, i+1);
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3614 if (is_constant_false(c, ch)) {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3615 /* We're going to skip this block. However, if this
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3616 is a generator, we have to check the dead code
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3617 anyway to make sure there aren't any return stmts
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3618 with expressions, in the same scope. */
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3619 if (c->c_flags & CO_GENERATOR) {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3620 node *p = look_for_offending_return(n);
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3621 if (p != NULL) {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3622 int savelineno = c->c_lineno;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3623 c->c_lineno = p->n_lineno;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3624 com_error(c, PyExc_SyntaxError,
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3625 "'return' with argument "
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3626 "inside generator");
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3627 c->c_lineno = savelineno;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3628 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3629 }
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3630 continue;
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3631 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3632 if (i > 0)
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3633 com_set_lineno(c, ch->n_lineno);
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3634 com_node(c, ch);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3635 com_addfwref(c, JUMP_IF_FALSE, &a);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3636 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3637 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3638 com_node(c, CHILD(n, i+3));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3639 com_addfwref(c, JUMP_FORWARD, &anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3640 com_backpatch(c, a);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3641 /* We jump here with an extra entry which we now pop */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3642 com_addbyte(c, POP_TOP);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3643 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3644 if (i+2 < NCH(n))
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3645 com_node(c, CHILD(n, i+2));
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3646 if (anchor)
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3647 com_backpatch(c, anchor);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3648 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3649
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3650 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3651 com_while_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3652 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3653 int break_anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3654 int anchor = 0;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3655 int save_begin = c->c_begin;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3656 REQ(n, while_stmt); /* 'while' test ':' suite ['else' ':' suite] */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3657 com_addfwref(c, SETUP_LOOP, &break_anchor);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3658 block_push(c, SETUP_LOOP);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3659 c->c_begin = c->c_nexti;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3660 com_set_lineno(c, n->n_lineno);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3661 com_node(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3662 com_addfwref(c, JUMP_IF_FALSE, &anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3663 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3664 com_pop(c, 1);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3665 c->c_loops++;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3666 com_node(c, CHILD(n, 3));
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3667 c->c_loops--;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3668 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3669 c->c_begin = save_begin;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3670 com_backpatch(c, anchor);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3671 /* We jump here with one entry more on the stack */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3672 com_addbyte(c, POP_TOP);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3673 com_addbyte(c, POP_BLOCK);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3674 block_pop(c, SETUP_LOOP);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3675 if (NCH(n) > 4)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3676 com_node(c, CHILD(n, 6));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3677 com_backpatch(c, break_anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3678 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3679
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3680 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3681 com_for_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3682 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3683 int break_anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3684 int anchor = 0;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3685 int save_begin = c->c_begin;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3686 REQ(n, for_stmt);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3687 /* 'for' exprlist 'in' exprlist ':' suite ['else' ':' suite] */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3688 com_addfwref(c, SETUP_LOOP, &break_anchor);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3689 block_push(c, SETUP_LOOP);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3690 com_node(c, CHILD(n, 3));
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	3691 com_addbyte(c, GET_ITER);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3692 c->c_begin = c->c_nexti;
28887 e4eabe5b3da1 Use Tim's suggestion to fix Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	3693 com_set_lineno(c, c->c_last_line);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	3694 com_addfwref(c, FOR_ITER, &anchor);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3695 com_push(c, 1);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3696 com_assign(c, CHILD(n, 1), OP_ASSIGN, NULL);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3697 c->c_loops++;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3698 com_node(c, CHILD(n, 5));
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3699 c->c_loops--;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3700 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3701 c->c_begin = save_begin;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3702 com_backpatch(c, anchor);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	3703 com_pop(c, 1); /* FOR_ITER has popped this */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3704 com_addbyte(c, POP_BLOCK);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3705 block_pop(c, SETUP_LOOP);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3706 if (NCH(n) > 8)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3707 com_node(c, CHILD(n, 8));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3708 com_backpatch(c, break_anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3709 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3710
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3711 /* Code generated for "try: S finally: Sf" is as follows:
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3712
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3713 SETUP_FINALLY L
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3714 <code for S>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3715 POP_BLOCK
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3716 LOAD_CONST <nil>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3717 L: <code for Sf>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3718 END_FINALLY
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3719
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3720 The special instructions use the block stack. Each block
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3721 stack entry contains the instruction that created it (here
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3722 SETUP_FINALLY), the level of the value stack at the time the
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3723 block stack entry was created, and a label (here L).
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3724
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3725 SETUP_FINALLY:
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3726 Pushes the current value stack level and the label
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3727 onto the block stack.
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3728 POP_BLOCK:
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3729 Pops en entry from the block stack, and pops the value
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3730 stack until its level is the same as indicated on the
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3731 block stack. (The label is ignored.)
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3732 END_FINALLY:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3733 Pops a variable number of entries from the value stack
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3734 and re-raises the exception they specify. The number of
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3735 entries popped depends on the (pseudo) exception type.
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3736
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3737 The block stack is unwound when an exception is raised:
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3738 when a SETUP_FINALLY entry is found, the exception is pushed
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3739 onto the value stack (and the exception condition is cleared),
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3740 and the interpreter jumps to the label gotten from the block
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3741 stack.
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3742
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3743 Code generated for "try: S except E1, V1: S1 except E2, V2: S2 ...":
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3744 (The contents of the value stack is shown in [], with the top
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3745 at the right; 'tb' is trace-back info, 'val' the exception's
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3746 associated value, and 'exc' the exception.)
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3747
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3748 Value stack Label Instruction Argument
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3749 [] SETUP_EXCEPT L1
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3750 [] <code for S>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3751 [] POP_BLOCK
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3752 [] JUMP_FORWARD L0
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3753
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3754 [tb, val, exc] L1: DUP )
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3755 [tb, val, exc, exc] <evaluate E1> )
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3756 [tb, val, exc, exc, E1] COMPARE_OP EXC_MATCH ) only if E1
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3757 [tb, val, exc, 1-or-0] JUMP_IF_FALSE L2 )
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3758 [tb, val, exc, 1] POP )
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3759 [tb, val, exc] POP
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3760 [tb, val] <assign to V1> (or POP if no V1)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3761 [tb] POP
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3762 [] <code for S1>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3763 JUMP_FORWARD L0
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3764
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3765 [tb, val, exc, 0] L2: POP
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3766 [tb, val, exc] DUP
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3767 .............................etc.......................
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3768
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3769 [tb, val, exc, 0] Ln+1: POP
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3770 [tb, val, exc] END_FINALLY # re-raise exception
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3771
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3772 [] L0: <next statement>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3773
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3774 Of course, parts are not generated if Vi or Ei is not present.
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3775 */
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3776
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3777 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3778 com_try_except(struct compiling c, node n)
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3779 {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3780 int except_anchor = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3781 int end_anchor = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3782 int else_anchor = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3783 int i;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3784 node *ch;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3785
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3786 com_addfwref(c, SETUP_EXCEPT, &except_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3787 block_push(c, SETUP_EXCEPT);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3788 com_node(c, CHILD(n, 2));
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3789 com_addbyte(c, POP_BLOCK);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3790 block_pop(c, SETUP_EXCEPT);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3791 com_addfwref(c, JUMP_FORWARD, &else_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3792 com_backpatch(c, except_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3793 for (i = 3;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3794 i < NCH(n) && TYPE(ch = CHILD(n, i)) == except_clause;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3795 i += 3) {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3796 /* except_clause: 'except' [expr [',' var]] */
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3797 if (except_anchor == 0) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3798 com_error(c, PyExc_SyntaxError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	3799 "default 'except:' must be last");
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3800 break;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3801 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3802 except_anchor = 0;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3803 com_push(c, 3); /* tb, val, exc pushed by exception */
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3804 com_set_lineno(c, ch->n_lineno);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3805 if (NCH(ch) > 1) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3806 com_addbyte(c, DUP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3807 com_push(c, 1);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3808 com_node(c, CHILD(ch, 1));
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	3809 com_addoparg(c, COMPARE_OP, PyCmp_EXC_MATCH);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3810 com_pop(c, 1);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3811 com_addfwref(c, JUMP_IF_FALSE, &except_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3812 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3813 com_pop(c, 1);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3814 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3815 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3816 com_pop(c, 1);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3817 if (NCH(ch) > 3)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3818 com_assign(c, CHILD(ch, 3), OP_ASSIGN, NULL);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3819 else {
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3820 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3821 com_pop(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3822 }
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3823 com_addbyte(c, POP_TOP);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3824 com_pop(c, 1);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3825 com_node(c, CHILD(n, i+2));
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3826 com_addfwref(c, JUMP_FORWARD, &end_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3827 if (except_anchor) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3828 com_backpatch(c, except_anchor);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3829 /* We come in with [tb, val, exc, 0] on the
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3830 stack; one pop and it's the same as
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3831 expected at the start of the loop */
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3832 com_addbyte(c, POP_TOP);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3833 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3834 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3835 /* We actually come in here with [tb, val, exc] but the
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3836 END_FINALLY will zap those and jump around.
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3837 The c_stacklevel does not reflect them so we need not pop
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3838 anything. */
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3839 com_addbyte(c, END_FINALLY);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3840 com_backpatch(c, else_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3841 if (i < NCH(n))
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3842 com_node(c, CHILD(n, i+2));
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3843 com_backpatch(c, end_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3844 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3845
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3846 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3847 com_try_finally(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3848 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3849 int finally_anchor = 0;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3850 node *ch;
792 dc3b455f7632 Only * can be used for varargs argument lists Guido van Rossum <guido@python.org> parents: 744 diff changeset	3851
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3852 com_addfwref(c, SETUP_FINALLY, &finally_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3853 block_push(c, SETUP_FINALLY);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3854 com_node(c, CHILD(n, 2));
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3855 com_addbyte(c, POP_BLOCK);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3856 block_pop(c, SETUP_FINALLY);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3857 block_push(c, END_FINALLY);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3858 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3859 /* While the generated code pushes only one item,
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3860 the try-finally handling can enter here with
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3861 up to three items. OK, here are the details:
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3862 3 for an exception, 2 for RETURN, 1 for BREAK. */
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3863 com_push(c, 3);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3864 com_backpatch(c, finally_anchor);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3865 ch = CHILD(n, NCH(n)-1);
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3866 com_set_lineno(c, ch->n_lineno);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3867 com_node(c, ch);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3868 com_addbyte(c, END_FINALLY);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3869 block_pop(c, END_FINALLY);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3870 com_pop(c, 3); /* Matches the com_push above */
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3871 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3872
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3873 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3874 com_try_stmt(struct compiling c, node n)
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3875 {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3876 REQ(n, try_stmt);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3877 /* 'try' ':' suite (except_clause ':' suite)+ ['else' ':' suite]
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3878 \| 'try' ':' suite 'finally' ':' suite */
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3879 if (TYPE(CHILD(n, 3)) != except_clause)
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3880 com_try_finally(c, n);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3881 else
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3882 com_try_except(c, n);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3883 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3884
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3885 static node *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3886 get_rawdocstring(node *n)
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3887 {
2241 fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3888 int i;
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3889
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3890 /* Label to avoid tail recursion */
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3891 next:
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3892 switch (TYPE(n)) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3893
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3894 case suite:
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3895 if (NCH(n) == 1) {
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3896 n = CHILD(n, 0);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3897 goto next;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3898 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3899 /* Fall through */
2241 fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3900 case file_input:
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3901 for (i = 0; i < NCH(n); i++) {
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3902 node *ch = CHILD(n, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3903 if (TYPE(ch) == stmt) {
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3904 n = ch;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3905 goto next;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3906 }
2241 fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3907 }
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3908 break;
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3909
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3910 case stmt:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3911 case simple_stmt:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3912 case small_stmt:
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3913 n = CHILD(n, 0);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3914 goto next;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3915
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3916 case expr_stmt:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3917 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	3918 case testlist1:
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3919 case test:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3920 case and_test:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3921 case not_test:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3922 case comparison:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3923 case expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3924 case xor_expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3925 case and_expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3926 case shift_expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3927 case arith_expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3928 case term:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3929 case factor:
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3930 case power:
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3931 if (NCH(n) == 1) {
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3932 n = CHILD(n, 0);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3933 goto next;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3934 }
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3935 break;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3936
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3937 case atom:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3938 if (TYPE(CHILD(n, 0)) == STRING)
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3939 return n;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3940 break;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3941
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3942 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3943 return NULL;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3944 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3945
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3946 static PyObject *
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	3947 get_docstring(struct compiling c, node n)
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3948 {
9987 b7bcc2cda1b3 Implement -OO; "unsafe" optimization that removes docstrings. Guido van Rossum <guido@python.org> parents: 9626 diff changeset	3949 /* Don't generate doc-strings if run with -OO */
b7bcc2cda1b3 Implement -OO; "unsafe" optimization that removes docstrings. Guido van Rossum <guido@python.org> parents: 9626 diff changeset	3950 if (Py_OptimizeFlag > 1)
b7bcc2cda1b3 Implement -OO; "unsafe" optimization that removes docstrings. Guido van Rossum <guido@python.org> parents: 9626 diff changeset	3951 return NULL;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3952 n = get_rawdocstring(n);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3953 if (n == NULL)
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3954 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	3955 return parsestrplus(c, n);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3956 }
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3957
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3958 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3959 com_suite(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3960 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3961 REQ(n, suite);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3962 /* simple_stmt \| NEWLINE INDENT NEWLINE* (stmt NEWLINE)+ DEDENT /
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3963 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3964 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3965 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3966 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3967 int i;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	3968 for (i = 0; i < NCH(n) && c->c_errors == 0; i++) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3969 node *ch = CHILD(n, i);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3970 if (TYPE(ch) == stmt)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3971 com_node(c, ch);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3972 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3973 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3974 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3975
744 834dd4a77ee2 fix what lint found Guido van Rossum <guido@python.org> parents: 703 diff changeset	3976 /* ARGSUSED */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3977 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3978 com_continue_stmt(struct compiling c, node n)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3979 {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3980 int i = c->c_nblocks;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3981 if (i-- > 0 && c->c_block[i] == SETUP_LOOP) {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3982 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3983 }
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3984 else if (i <= 0) {
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3985 /* at the outer level */
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3986 com_error(c, PyExc_SyntaxError,
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3987 "'continue' not properly in loop");
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3988 }
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3989 else {
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3990 int j;
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3991 for (j = i-1; j >= 0; --j) {
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3992 if (c->c_block[j] == SETUP_LOOP)
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3993 break;
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3994 }
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3995 if (j >= 0) {
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3996 /* there is a loop, but something interferes */
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3997 for (; i > j; --i) {
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3998 if (c->c_block[i] == SETUP_EXCEPT \|\|
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3999 c->c_block[i] == SETUP_FINALLY) {
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	4000 com_addoparg(c, CONTINUE_LOOP,
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	4001 c->c_begin);
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	4002 return;
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	4003 }
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	4004 if (c->c_block[i] == END_FINALLY) {
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	4005 com_error(c, PyExc_SyntaxError,
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	4006 "'continue' not supported inside 'finally' clause");
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	4007 return;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	4008 }
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	4009 }
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	4010 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4011 com_error(c, PyExc_SyntaxError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4012 "'continue' not properly in loop");
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4013 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4014 /* XXX Could allow it inside a 'finally' clause
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4015 XXX if we could pop the exception still on the stack */
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4016 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4017
30226 806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4018 /* Return the number of default values in the argument list.
806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4019
806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4020 If a non-default argument follows a default argument, set an
806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4021 exception and return -1.
806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4022 */
806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4023
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4024 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4025 com_argdefs(struct compiling c, node n)
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4026 {
30226 806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4027 int i, nch, ndefs;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4028 if (TYPE(n) == lambdef) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4029 /* lambdef: 'lambda' [varargslist] ':' test */
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4030 n = CHILD(n, 1);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4031 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4032 else {
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4033 REQ(n, funcdef);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4034 /* funcdef: [decorators] 'def' NAME parameters ':' suite */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4035 n = RCHILD(n, -3);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4036 REQ(n, parameters); /* parameters: '(' [varargslist] ')' */
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4037 n = CHILD(n, 1);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4038 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4039 if (TYPE(n) != varargslist)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4040 return 0;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4041 /* varargslist:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4042 (fpdef ['=' test] ',')* '*' ....... \|
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4043 fpdef ['=' test] (',' fpdef ['=' test])* [','] */
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4044 nch = NCH(n);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4045 ndefs = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4046 for (i = 0; i < nch; i++) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4047 int t;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4048 if (TYPE(CHILD(n, i)) == STAR \|\|
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4049 TYPE(CHILD(n, i)) == DOUBLESTAR)
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2367 diff changeset	4050 break;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4051 i++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4052 if (i >= nch)
3103 e51e17b2d88b fix bug with missing default for last arg (discovered by Tommy Burnette) Guido van Rossum <guido@python.org> parents: 2844 diff changeset	4053 t = RPAR; /* Anything except EQUAL or COMMA */
e51e17b2d88b fix bug with missing default for last arg (discovered by Tommy Burnette) Guido van Rossum <guido@python.org> parents: 2844 diff changeset	4054 else
e51e17b2d88b fix bug with missing default for last arg (discovered by Tommy Burnette) Guido van Rossum <guido@python.org> parents: 2844 diff changeset	4055 t = TYPE(CHILD(n, i));
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4056 if (t == EQUAL) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4057 i++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4058 ndefs++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4059 com_node(c, CHILD(n, i));
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4060 i++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4061 if (i >= nch)
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4062 break;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4063 t = TYPE(CHILD(n, i));
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4064 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4065 else {
9214 c259c3c4d0cc Treat def f(a, b=1, c): ... as an error (missing default for c) Guido van Rossum <guido@python.org> parents: 9049 diff changeset	4066 /* Treat "(a=1, b)" as an error */
30226 806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4067 if (ndefs) {
9214 c259c3c4d0cc Treat def f(a, b=1, c): ... as an error (missing default for c) Guido van Rossum <guido@python.org> parents: 9049 diff changeset	4068 com_error(c, PyExc_SyntaxError,
9215 1995cdbe3384 Eh, better error message for the previous change. It now says Guido van Rossum <guido@python.org> parents: 9214 diff changeset	4069 "non-default argument follows default argument");
30226 806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4070 return -1;
806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4071 }
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4072 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4073 if (t != COMMA)
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4074 break;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4075 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4076 return ndefs;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4077 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4078
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4079 static void
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4080 com_decorator_name(struct compiling c, node n)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4081 {
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4082 /* dotted_name: NAME ('.' NAME)* */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4083
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4084 int i, nch;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4085 node *varname;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4086
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4087 REQ(n, dotted_name);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4088 nch = NCH(n);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4089 assert(nch >= 1 && nch % 2 == 1);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4090
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4091 varname = CHILD(n, 0);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4092 REQ(varname, NAME);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4093 com_addop_varname(c, VAR_LOAD, STR(varname));
32892 685a948b3bc9 fix for @decorators under a debug build. Anthony Baxter <anthonybaxter@gmail.com> parents: 32888 diff changeset	4094 com_push(c, 1);
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4095
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4096 for (i = 1; i < nch; i += 2) {
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4097 node *attrname;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4098
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4099 REQ(CHILD(n, i), DOT);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4100
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4101 attrname = CHILD(n, i + 1);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4102 REQ(attrname, NAME);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4103 com_addop_name(c, LOAD_ATTR, STR(attrname));
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4104 }
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4105 }
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4106
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4107 static void
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4108 com_decorator(struct compiling c, node n)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4109 {
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4110 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4111 int nch = NCH(n);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4112 assert(nch >= 3);
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4113 REQ(CHILD(n, 0), AT);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4114 REQ(RCHILD(n, -1), NEWLINE);
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4115 com_decorator_name(c, CHILD(n, 1));
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4116
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4117 if (nch > 3) {
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4118 assert(nch == 5 \|\| nch == 6);
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4119 REQ(CHILD(n, 2), LPAR);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4120 REQ(RCHILD(n, -2), RPAR);
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4121 com_call_function(c, CHILD(n, 3));
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4122 }
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4123 }
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4124
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4125 static int
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4126 com_decorators(struct compiling c, node n)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4127 {
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4128 int i, nch;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4129
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4130 /* decorator+ */
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4131 nch = NCH(n);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4132 assert(nch >= 1);
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4133
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4134 for (i = 0; i < nch; ++i) {
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4135 node *ch = CHILD(n, i);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4136 REQ(ch, decorator);
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4137
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4138 com_decorator(c, ch);
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4139 }
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4140
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4141 return nch;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4142 }
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4143
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4144 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4145 com_funcdef(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4146 {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4147 PyObject *co;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4148 int ndefs, ndecorators;
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4149
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4150 REQ(n, funcdef);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4151 /* -6 -5 -4 -3 -2 -1
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4152 funcdef: [decorators] 'def' NAME parameters ':' suite */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4153
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4154 if (NCH(n) == 6)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4155 ndecorators = com_decorators(c, CHILD(n, 0));
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4156 else
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4157 ndecorators = 0;
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4158
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4159 ndefs = com_argdefs(c, n);
30226 806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4160 if (ndefs < 0)
806179400f35 Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Jeremy Hylton <jeremy@alum.mit.edu> parents: 29869 diff changeset	4161 return;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4162 symtable_enter_scope(c->c_symtable, STR(RCHILD(n, -4)), TYPE(n),
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4163 n->n_lineno);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4164 co = (PyObject *)icompile(n, c);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4165 symtable_exit_scope(c->c_symtable);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4166 if (co == NULL)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4167 c->c_errors++;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4168 else {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4169 int closure = com_make_closure(c, (PyCodeObject *)co);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4170 int i = com_addconst(c, co);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4171 com_addoparg(c, LOAD_CONST, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4172 com_push(c, 1);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4173 if (closure)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4174 com_addoparg(c, MAKE_CLOSURE, ndefs);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4175 else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4176 com_addoparg(c, MAKE_FUNCTION, ndefs);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4177 com_pop(c, ndefs);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4178
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4179 while (ndecorators > 0) {
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4180 com_addoparg(c, CALL_FUNCTION, 1);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4181 com_pop(c, 1);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4182 --ndecorators;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4183 }
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33133 diff changeset	4184
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4185 com_addop_varname(c, VAR_STORE, STR(RCHILD(n, -4)));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4186 com_pop(c, 1);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4187 Py_DECREF(co);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4188 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4189 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4190
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4191 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4192 com_bases(struct compiling c, node n)
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4193 {
744 834dd4a77ee2 fix what lint found Guido van Rossum <guido@python.org> parents: 703 diff changeset	4194 int i;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4195 REQ(n, testlist);
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4196 /* testlist: test (',' test)* [','] */
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4197 for (i = 0; i < NCH(n); i += 2)
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4198 com_node(c, CHILD(n, i));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4199 i = (NCH(n)+1) / 2;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4200 com_addoparg(c, BUILD_TUPLE, i);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4201 com_pop(c, i-1);
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4202 }
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4203
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4204 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4205 com_classdef(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4206 {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4207 int i;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4208 PyObject *v;
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4209 PyCodeObject *co;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4210 char *name;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4211
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4212 REQ(n, classdef);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4213 /* classdef: class NAME ['(' testlist ')'] ':' suite */
5009 402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	4214 if ((v = PyString_InternFromString(STR(CHILD(n, 1)))) == NULL) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4215 c->c_errors++;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4216 return;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4217 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4218 /* Push the class name on the stack */
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4219 i = com_addconst(c, v);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4220 com_addoparg(c, LOAD_CONST, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4221 com_push(c, 1);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4222 Py_DECREF(v);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4223 /* Push the tuple of base classes on the stack */
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4224 if (TYPE(CHILD(n, 2)) != LPAR) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4225 com_addoparg(c, BUILD_TUPLE, 0);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4226 com_push(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4227 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4228 else
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	4229 com_bases(c, CHILD(n, 3));
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4230 name = STR(CHILD(n, 1));
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4231 symtable_enter_scope(c->c_symtable, name, TYPE(n), n->n_lineno);
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4232 co = icompile(n, c);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4233 symtable_exit_scope(c->c_symtable);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4234 if (co == NULL)
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4235 c->c_errors++;
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4236 else {
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4237 int closure = com_make_closure(c, co);
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4238 i = com_addconst(c, (PyObject *)co);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4239 com_addoparg(c, LOAD_CONST, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4240 com_push(c, 1);
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4241 if (closure) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4242 com_addoparg(c, MAKE_CLOSURE, 0);
21398 de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21179 diff changeset	4243 com_pop(c, PyCode_GetNumFree(co));
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4244 } else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4245 com_addoparg(c, MAKE_FUNCTION, 0);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4246 com_addoparg(c, CALL_FUNCTION, 0);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4247 com_addbyte(c, BUILD_CLASS);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4248 com_pop(c, 2);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4249 com_addop_varname(c, VAR_STORE, STR(CHILD(n, 1)));
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4250 com_pop(c, 1);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4251 Py_DECREF(co);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4252 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4253 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4254
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4255 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4256 com_node(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4257 {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4258 loop:
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4259 if (c->c_errors)
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4260 return;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4261 switch (TYPE(n)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4262
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4263 /* Definition nodes */
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4264
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4265 case funcdef:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4266 com_funcdef(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4267 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4268 case classdef:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4269 com_classdef(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4270 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4271
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4272 /* Trivial parse tree nodes */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4273
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4274 case stmt:
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4275 case small_stmt:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4276 case flow_stmt:
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4277 n = CHILD(n, 0);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4278 goto loop;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4279
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4280 case simple_stmt:
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4281 /* small_stmt (';' small_stmt)* [';'] NEWLINE */
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	4282 com_set_lineno(c, n->n_lineno);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4283 {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4284 int i;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4285 for (i = 0; i < NCH(n)-1; i += 2)
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4286 com_node(c, CHILD(n, i));
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4287 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4288 break;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4289
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4290 case compound_stmt:
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	4291 com_set_lineno(c, n->n_lineno);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4292 n = CHILD(n, 0);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4293 goto loop;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4294
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4295 /* Statement nodes */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4296
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4297 case expr_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4298 com_expr_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4299 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4300 case print_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4301 com_print_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4302 break;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4303 case del_stmt: /* 'del' exprlist */
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	4304 com_assign(c, CHILD(n, 1), OP_DELETE, NULL);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4305 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4306 case pass_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4307 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4308 case break_stmt:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4309 if (c->c_loops == 0) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4310 com_error(c, PyExc_SyntaxError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4311 "'break' outside loop");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4312 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4313 com_addbyte(c, BREAK_LOOP);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4314 break;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4315 case continue_stmt:
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4316 com_continue_stmt(c, n);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	4317 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4318 case return_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4319 com_return_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4320 break;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	4321 case yield_stmt:
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	4322 com_yield_stmt(c, n);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	4323 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4324 case raise_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4325 com_raise_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4326 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4327 case import_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4328 com_import_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4329 break;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4330 case global_stmt:
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	4331 break;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	4332 case exec_stmt:
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	4333 com_exec_stmt(c, n);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	4334 break;
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	4335 case assert_stmt:
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	4336 com_assert_stmt(c, n);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	4337 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4338 case if_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4339 com_if_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4340 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4341 case while_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4342 com_while_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4343 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4344 case for_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4345 com_for_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4346 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4347 case try_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4348 com_try_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4349 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4350 case suite:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4351 com_suite(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4352 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4353
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4354 /* Expression nodes */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4355
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4356 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	4357 case testlist1:
20432 56141b86a7f2 Very subtle syntax change: in a list comprehension, the testlist in Guido van Rossum <guido@python.org> parents: 20012 diff changeset	4358 case testlist_safe:
482 ee899a81570d New argument passing. Guido van Rossum <guido@python.org> parents: 466 diff changeset	4359 com_list(c, n, 0);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4360 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4361 case test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4362 com_test(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4363 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4364 case and_test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4365 com_and_test(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4366 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4367 case not_test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4368 com_not_test(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4369 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4370 case comparison:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4371 com_comparison(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4372 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4373 case exprlist:
482 ee899a81570d New argument passing. Guido van Rossum <guido@python.org> parents: 466 diff changeset	4374 com_list(c, n, 0);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4375 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4376 case expr:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4377 com_expr(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4378 break;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4379 case xor_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4380 com_xor_expr(c, n);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4381 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4382 case and_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4383 com_and_expr(c, n);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4384 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4385 case shift_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4386 com_shift_expr(c, n);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4387 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4388 case arith_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4389 com_arith_expr(c, n);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	4390 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4391 case term:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4392 com_term(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4393 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4394 case factor:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4395 com_factor(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4396 break;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	4397 case power:
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	4398 com_power(c, n);
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	4399 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4400 case atom:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4401 com_atom(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4402 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4403
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4404 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4405 com_error(c, PyExc_SystemError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4406 "com_node: unexpected node type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4407 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4408 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4409
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	4410 static void com_fplist(struct compiling , node );
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4411
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4412 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4413 com_fpdef(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4414 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4415 REQ(n, fpdef); /* fpdef: NAME \| '(' fplist ')' */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4416 if (TYPE(CHILD(n, 0)) == LPAR)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4417 com_fplist(c, CHILD(n, 1));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4418 else {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4419 com_addop_varname(c, VAR_STORE, STR(CHILD(n, 0)));
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4420 com_pop(c, 1);
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4421 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4422 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4423
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4424 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4425 com_fplist(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4426 {
544 d0baa8300005 Minor changes. Guido van Rossum <guido@python.org> parents: 493 diff changeset	4427 REQ(n, fplist); /* fplist: fpdef (',' fpdef)* [','] */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4428 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4429 com_fpdef(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4430 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4431 else {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4432 int i = (NCH(n)+1)/2;
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13884 diff changeset	4433 com_addoparg(c, UNPACK_SEQUENCE, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4434 com_push(c, i-1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4435 for (i = 0; i < NCH(n); i += 2)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4436 com_fpdef(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4437 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4438 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4439
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4440 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4441 com_arglist(struct compiling c, node n)
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4442 {
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4443 int nch, i, narg;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4444 int complex = 0;
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4445 char nbuf[30];
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4446 REQ(n, varargslist);
617 755bb8efcc2d Use strtoul() for oct/hex constants. Guido van Rossum <guido@python.org> parents: 584 diff changeset	4447 /* varargslist:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4448 (fpdef ['=' test] ',')* (fpdef ['=' test] \| '' .....) /
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4449 nch = NCH(n);
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4450 /* Enter all arguments in table of locals */
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4451 for (i = 0, narg = 0; i < nch; i++) {
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4452 node *ch = CHILD(n, i);
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4453 node *fp;
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4454 if (TYPE(ch) == STAR \|\| TYPE(ch) == DOUBLESTAR)
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4455 break;
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4456 REQ(ch, fpdef); /* fpdef: NAME \| '(' fplist ')' */
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4457 fp = CHILD(ch, 0);
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4458 if (TYPE(fp) != NAME) {
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4459 PyOS_snprintf(nbuf, sizeof(nbuf), ".%d", i);
3766 516490c8192c Py_complex; and WITHOUT_COMPLEX added to getargs.c Guido van Rossum <guido@python.org> parents: 3366 diff changeset	4460 complex = 1;
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4461 }
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4462 narg++;
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4463 /* all name updates handled by symtable */
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4464 if (++i >= nch)
26754 8c3ef524faa0 Add warning for assignment to None, True and False. This is patch Guido van Rossum <guido@python.org> parents: 26701 diff changeset	4465 break;
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4466 ch = CHILD(n, i);
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4467 if (TYPE(ch) == EQUAL)
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4468 i += 2;
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4469 else
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4470 REQ(ch, COMMA);
ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4471 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4472 if (complex) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4473 /* Generate code for complex arguments only after
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4474 having counted the simple arguments */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4475 int ilocal = 0;
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4476 for (i = 0; i < nch; i++) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4477 node *ch = CHILD(n, i);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4478 node *fp;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	4479 if (TYPE(ch) == STAR \|\| TYPE(ch) == DOUBLESTAR)
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4480 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4481 REQ(ch, fpdef); /* fpdef: NAME \| '(' fplist ')' */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4482 fp = CHILD(ch, 0);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4483 if (TYPE(fp) != NAME) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4484 com_addoparg(c, LOAD_FAST, ilocal);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4485 com_push(c, 1);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4486 com_fpdef(c, ch);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4487 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4488 ilocal++;
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	4489 if (++i >= nch)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4490 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4491 ch = CHILD(n, i);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4492 if (TYPE(ch) == EQUAL)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4493 i += 2;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4494 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4495 REQ(ch, COMMA);
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4496 }
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4497 }
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4498 }
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4499
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4500 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4501 com_file_input(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4502 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4503 int i;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4504 PyObject *doc;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4505 REQ(n, file_input); /* (NEWLINE \| stmt)* ENDMARKER */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	4506 doc = get_docstring(c, n);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4507 if (doc != NULL) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4508 int i = com_addconst(c, doc);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4509 Py_DECREF(doc);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4510 com_addoparg(c, LOAD_CONST, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4511 com_push(c, 1);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4512 com_addop_name(c, STORE_NAME, "__doc__");
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4513 com_pop(c, 1);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4514 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4515 for (i = 0; i < NCH(n); i++) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4516 node *ch = CHILD(n, i);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4517 if (TYPE(ch) != ENDMARKER && TYPE(ch) != NEWLINE)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4518 com_node(c, ch);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4519 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4520 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4521
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4522 /* Top-level compile-node interface */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4523
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4524 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4525 compile_funcdef(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4526 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4527 PyObject *doc;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4528 node *ch;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4529 REQ(n, funcdef);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4530 /* -6 -5 -4 -3 -2 -1
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4531 funcdef: [decorators] 'def' NAME parameters ':' suite */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4532 c->c_name = STR(RCHILD(n, -4));
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4533 doc = get_docstring(c, RCHILD(n, -1));
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4534 if (doc != NULL) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4535 (void) com_addconst(c, doc);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4536 Py_DECREF(doc);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4537 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4538 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4539 (void) com_addconst(c, Py_None); /* No docstring */
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4540 ch = RCHILD(n, -3); /* parameters: '(' [varargslist] ')' */
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4541 ch = CHILD(ch, 1); /* ')' \| varargslist */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4542 if (TYPE(ch) == varargslist)
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4543 com_arglist(c, ch);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4544 c->c_infunction = 1;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	4545 com_node(c, RCHILD(n, -1));
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4546 c->c_infunction = 0;
31764 5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	4547 com_strip_lnotab(c);
25078 be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4548 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4549 com_push(c, 1);
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4550 com_addbyte(c, RETURN_VALUE);
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4551 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4552 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4553
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4554 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4555 compile_lambdef(struct compiling c, node n)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4556 {
1415 06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4557 node *ch;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4558 REQ(n, lambdef); /* lambdef: 'lambda' [varargslist] ':' test */
2005 ed5d0ad5ea2f set name to <lambda> instead of None for lambdas Guido van Rossum <guido@python.org> parents: 1833 diff changeset	4559 c->c_name = "<lambda>";
1415 06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4560
06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4561 ch = CHILD(n, 1);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4562 (void) com_addconst(c, Py_None); /* No docstring */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4563 if (TYPE(ch) == varargslist) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4564 com_arglist(c, ch);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4565 ch = CHILD(n, 3);
1415 06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4566 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4567 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4568 ch = CHILD(n, 2);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4569 com_node(c, ch);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4570 com_addbyte(c, RETURN_VALUE);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4571 com_pop(c, 1);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4572 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4573
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4574 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4575 compile_classdef(struct compiling c, node n)
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4576 {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4577 node *ch;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4578 PyObject *doc;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4579 REQ(n, classdef);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4580 /* classdef: 'class' NAME ['(' testlist ')'] ':' suite */
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4581 c->c_name = STR(CHILD(n, 1));
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4582 c->c_private = c->c_name;
21725 5d2bfbd47f1b A tentative fix for SF bug #503837 (Roeland Rengelink): Guido van Rossum <guido@python.org> parents: 21609 diff changeset	4583 /* Initialize local __module__ from global __name__ */
5d2bfbd47f1b A tentative fix for SF bug #503837 (Roeland Rengelink): Guido van Rossum <guido@python.org> parents: 21609 diff changeset	4584 com_addop_name(c, LOAD_GLOBAL, "__name__");
5d2bfbd47f1b A tentative fix for SF bug #503837 (Roeland Rengelink): Guido van Rossum <guido@python.org> parents: 21609 diff changeset	4585 com_addop_name(c, STORE_NAME, "__module__");
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4586 ch = CHILD(n, NCH(n)-1); /* The suite */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	4587 doc = get_docstring(c, ch);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4588 if (doc != NULL) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4589 int i = com_addconst(c, doc);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4590 Py_DECREF(doc);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4591 com_addoparg(c, LOAD_CONST, i);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4592 com_push(c, 1);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4593 com_addop_name(c, STORE_NAME, "__doc__");
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4594 com_pop(c, 1);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4595 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4596 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4597 (void) com_addconst(c, Py_None);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4598 com_node(c, ch);
31764 5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	4599 com_strip_lnotab(c);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4600 com_addbyte(c, LOAD_LOCALS);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4601 com_push(c, 1);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4602 com_addbyte(c, RETURN_VALUE);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4603 com_pop(c, 1);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4604 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4605
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4606 static void
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4607 compile_generator_expression(struct compiling c, node n)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4608 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4609 /* testlist_gexp: test gen_for */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4610 /* argument: test gen_for */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4611 REQ(CHILD(n, 0), test);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4612 REQ(CHILD(n, 1), gen_for);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4613
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4614 c->c_name = "<generator expression>";
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4615 com_gen_for(c, CHILD(n, 1), CHILD(n, 0), 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4616
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4617 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4618 com_push(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4619 com_addbyte(c, RETURN_VALUE);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4620 com_pop(c, 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4621 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4622
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4623 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4624 compile_node(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4625 {
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	4626 com_set_lineno(c, n->n_lineno);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4627
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4628 switch (TYPE(n)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4629
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4630 case single_input: /* One interactive command */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4631 /* NEWLINE \| simple_stmt \| compound_stmt NEWLINE */
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4632 c->c_interactive++;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4633 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4634 if (TYPE(n) != NEWLINE)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4635 com_node(c, n);
31764 5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	4636 com_strip_lnotab(c);
25078 be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4637 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4638 com_push(c, 1);
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4639 com_addbyte(c, RETURN_VALUE);
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4640 com_pop(c, 1);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4641 c->c_interactive--;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4642 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4643
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4644 case file_input: /* A whole file, or built-in function exec() */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4645 com_file_input(c, n);
31764 5e916d46a3fb Fix for line events in the case: Armin Rigo <arigo@tunes.org> parents: 31728 diff changeset	4646 com_strip_lnotab(c);
25078 be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4647 com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None));
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4648 com_push(c, 1);
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4649 com_addbyte(c, RETURN_VALUE);
be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24858 diff changeset	4650 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4651 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4652
1415 06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4653 case eval_input: /* Built-in function input() */
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4654 com_node(c, CHILD(n, 0));
c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4655 com_addbyte(c, RETURN_VALUE);
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4656 com_pop(c, 1);
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4657 break;
c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4658
1415 06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4659 case lambdef: /* anonymous function definition */
06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4660 compile_lambdef(c, n);
06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4661 break;
06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4662
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4663 case funcdef: /* A function definition */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4664 compile_funcdef(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4665 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4666
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4667 case classdef: /* A class definition */
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4668 compile_classdef(c, n);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4669 break;
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4670
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4671 case testlist_gexp: /* A generator expression */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4672 case argument: /* A generator expression */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4673 compile_generator_expression(c, n);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4674 break;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4675
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4676 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4677 com_error(c, PyExc_SystemError,
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	4678 "compile_node: unexpected node type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4679 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4680 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4681
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4682 static PyObject *
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4683 dict_keys_inorder(PyObject *dict, int offset)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4684 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4685 PyObject tuple, k, *v;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4686 int i, pos = 0, size = PyDict_Size(dict);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4687
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4688 tuple = PyTuple_New(size);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4689 if (tuple == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4690 return NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4691 while (PyDict_Next(dict, &pos, &k, &v)) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4692 i = PyInt_AS_LONG(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4693 Py_INCREF(k);
17078 7e181eba6b9b Fixup handling of free variables in methods when the class scope also Jeremy Hylton <jeremy@alum.mit.edu> parents: 17076 diff changeset	4694 assert((i - offset) < size);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4695 PyTuple_SET_ITEM(tuple, i - offset, k);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4696 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4697 return tuple;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4698 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4699
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4700 PyCodeObject *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	4701 PyNode_Compile(node n, const char filename)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4702 {
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4703 return PyNode_CompileFlags(n, filename, NULL);
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4704 }
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4705
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4706 PyCodeObject *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	4707 PyNode_CompileFlags(node n, const char filename, PyCompilerFlags *flags)
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4708 {
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4709 return jcompile(n, filename, NULL, flags);
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4710 }
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4711
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4712 struct symtable *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	4713 PyNode_CompileSymtable(node n, const char filename)
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4714 {
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4715 struct symtable *st;
17112 76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4716 PyFutureFeatures *ff;
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4717
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4718 ff = PyNode_Future(n, filename);
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4719 if (ff == NULL)
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4720 return NULL;
29869 3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4721 st = symtable_build(n, ff, filename);
20867 40a88989d6cb Part of SF bug #478003 possible memory leaks in err handling. Tim Peters <tim.peters@gmail.com> parents: 20517 diff changeset	4722 if (st == NULL) {
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	4723 PyObject_FREE((void *)ff);
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4724 return NULL;
20867 40a88989d6cb Part of SF bug #478003 possible memory leaks in err handling. Tim Peters <tim.peters@gmail.com> parents: 20517 diff changeset	4725 }
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4726 return st;
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4727 }
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4728
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4729 static PyCodeObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4730 icompile(node n, struct compiling base)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4731 {
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4732 return jcompile(n, base->c_filename, base, NULL);
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4733 }
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4734
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4735 static PyCodeObject *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	4736 jcompile(node n, const char filename, struct compiling *base,
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4737 PyCompilerFlags *flags)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4738 {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4739 struct compiling sc;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4740 PyCodeObject *co;
1415 06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4741 if (!com_init(&sc, filename))
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4742 return NULL;
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27712 diff changeset	4743 if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27712 diff changeset	4744 sc.c_encoding = "utf-8";
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27712 diff changeset	4745 } else if (TYPE(n) == encoding_decl) {
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4746 sc.c_encoding = STR(n);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4747 n = CHILD(n, 0);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4748 } else {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4749 sc.c_encoding = NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4750 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4751 if (base) {
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4752 sc.c_private = base->c_private;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4753 sc.c_symtable = base->c_symtable;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4754 /* c_symtable still points to parent's symbols */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4755 if (base->c_nested
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4756 \|\| (sc.c_symtable->st_cur->ste_type == TYPE_FUNCTION))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4757 sc.c_nested = 1;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	4758 sc.c_flags \|= base->c_flags & PyCF_MASK;
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4759 if (base->c_encoding != NULL) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4760 assert(sc.c_encoding == NULL);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4761 sc.c_encoding = base->c_encoding;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4762 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4763 } else {
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4764 sc.c_private = NULL;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: 16783 diff changeset	4765 sc.c_future = PyNode_Future(n, filename);
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4766 if (sc.c_future == NULL) {
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4767 com_free(&sc);
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4768 return NULL;
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4769 }
19252 fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4770 if (flags) {
fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4771 int merged = sc.c_future->ff_features \|
fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4772 flags->cf_flags;
fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4773 sc.c_future->ff_features = merged;
fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4774 flags->cf_flags = merged;
fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4775 }
29869 3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4776 sc.c_symtable = symtable_build(n, sc.c_future, sc.c_filename);
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4777 if (sc.c_symtable == NULL) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4778 com_free(&sc);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4779 return NULL;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4780 }
29869 3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4781 /* reset symbol table for second pass */
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4782 sc.c_symtable->st_nscopes = 1;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4783 sc.c_symtable->st_pass = 2;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4784 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4785 co = NULL;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4786 if (symtable_load_symbols(&sc) < 0) {
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4787 sc.c_errors++;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4788 goto exit;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4789 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4790 compile_node(&sc, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4791 com_done(&sc);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	4792 if (sc.c_errors == 0) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4793 PyObject consts, names, varnames, filename, *name,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4794 freevars, cellvars;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4795 consts = PyList_AsTuple(sc.c_consts);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4796 names = PyList_AsTuple(sc.c_names);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4797 varnames = PyList_AsTuple(sc.c_varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4798 cellvars = dict_keys_inorder(sc.c_cellvars, 0);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4799 freevars = dict_keys_inorder(sc.c_freevars,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4800 PyTuple_GET_SIZE(cellvars));
32956 071d3381753b Revert 2.312; turns out interning the file name did do some good (reducing Michael W. Hudson <mwh@python.net> parents: 32917 diff changeset	4801 filename = PyString_InternFromString(sc.c_filename);
5009 402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	4802 name = PyString_InternFromString(sc.c_name);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4803 if (!PyErr_Occurred())
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4804 co = PyCode_New(sc.c_argcount,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4805 sc.c_nlocals,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4806 sc.c_maxstacklevel,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4807 sc.c_flags,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4808 sc.c_code,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4809 consts,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4810 names,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4811 varnames,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4812 freevars,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4813 cellvars,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4814 filename,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4815 name,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4816 sc.c_firstlineno,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4817 sc.c_lnotab);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4818 Py_XDECREF(consts);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4819 Py_XDECREF(names);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4820 Py_XDECREF(varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4821 Py_XDECREF(freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4822 Py_XDECREF(cellvars);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4823 Py_XDECREF(filename);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4824 Py_XDECREF(name);
266 b5826bf29677 Changed and exported newcodeobject() interface, for ".pyc" files. Guido van Rossum <guido@python.org> parents: 238 diff changeset	4825 }
13884 8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4826 else if (!PyErr_Occurred()) {
8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4827 /* This could happen if someone called PyErr_Clear() after an
8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4828 error was reported above. That's not supposed to happen,
8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4829 but I just plugged one case and I'm not sure there can't be
8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4830 others. In that case, raise SystemError so that at least
8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4831 it gets reported instead dumping core. */
8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4832 PyErr_SetString(PyExc_SystemError, "lost syntax error");
8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4833 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4834 exit:
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	4835 if (base == NULL) {
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4836 PySymtable_Free(sc.c_symtable);
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	4837 sc.c_symtable = NULL;
51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	4838 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4839 com_free(&sc);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4840 return co;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4841 }
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4842
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4843 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4844 PyCode_Addr2Line(PyCodeObject *co, int addrq)
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4845 {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4846 int size = PyString_Size(co->co_lnotab) / 2;
11290 ccdf5dc2acf6 Tim Peters writes: Guido van Rossum <guido@python.org> parents: 9987 diff changeset	4847 unsigned char p = (unsigned char)PyString_AsString(co->co_lnotab);
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4848 int line = co->co_firstlineno;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4849 int addr = 0;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4850 while (--size >= 0) {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4851 addr += *p++;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4852 if (addr > addrq)
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4853 break;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4854 line += *p++;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4855 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4856 return line;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4857 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4858
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4859 /* The test for LOCAL must come before the test for FREE in order to
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4860 handle classes where name is both local and free. The local var is
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4861 a method and the free var is a free var referenced within a method.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4862 */
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4863
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4864 static int
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4865 get_ref_type(struct compiling c, char name)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4866 {
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4867 char buf[350];
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4868 PyObject *v;
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4869
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4870 if (PyDict_GetItemString(c->c_cellvars, name) != NULL)
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4871 return CELL;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4872 if (PyDict_GetItemString(c->c_locals, name) != NULL)
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4873 return LOCAL;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4874 if (PyDict_GetItemString(c->c_freevars, name) != NULL)
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4875 return FREE;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4876 v = PyDict_GetItemString(c->c_globals, name);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4877 if (v) {
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4878 if (v == Py_None)
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4879 return GLOBAL_EXPLICIT;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4880 else {
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4881 return GLOBAL_IMPLICIT;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4882 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4883 }
21066 225c7dd17e37 Fixes for possible buffer overflows in sprintf() usages. Marc-André Lemburg <mal@egenix.com> parents: 20947 diff changeset	4884 PyOS_snprintf(buf, sizeof(buf),
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4885 "unknown scope for %.100s in %.100s(%s) "
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4886 "in %s\nsymbols: %s\nlocals: %s\nglobals: %s\n",
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4887 name, c->c_name,
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4888 PyObject_REPR(c->c_symtable->st_cur->ste_id),
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4889 c->c_filename,
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4890 PyObject_REPR(c->c_symtable->st_cur->ste_symbols),
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4891 PyObject_REPR(c->c_locals),
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4892 PyObject_REPR(c->c_globals)
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4893 );
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4894
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4895 Py_FatalError(buf);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4896 return -1;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4897 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4898
16933 b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4899 /* Helper functions to issue warnings */
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4900
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4901 static int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26319 diff changeset	4902 issue_warning(const char msg, const char filename, int lineno)
16933 b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4903 {
29869 3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4904 if (PyErr_Occurred()) {
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4905 /* This can happen because symtable_node continues
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4906 processing even after raising a SyntaxError.
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4907 Calling PyErr_WarnExplicit now would clobber the
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4908 pending exception; instead we fail and let that
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4909 exception propagate.
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4910 */
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4911 return -1;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4912 }
16933 b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4913 if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, filename,
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4914 lineno, NULL, NULL) < 0) {
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4915 if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4916 PyErr_SetString(PyExc_SyntaxError, msg);
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4917 PyErr_SyntaxLocation(filename, lineno);
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4918 }
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4919 return -1;
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4920 }
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4921 return 0;
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4922 }
16855 ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	4923
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4924 static int
16855 ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	4925 symtable_warn(struct symtable st, char msg)
ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	4926 {
16933 b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4927 if (issue_warning(msg, st->st_filename, st->st_cur->ste_lineno) < 0) {
16855 ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	4928 st->st_errors++;
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4929 return -1;
16855 ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	4930 }
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4931 return 0;
16855 ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	4932 }
ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	4933
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	4934 /* Helper function for setting lineno and filename */
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	4935
29869 3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4936 static struct symtable *
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4937 symtable_build(node n, PyFutureFeatures ff, const char *filename)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4938 {
29869 3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4939 struct symtable *st;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4940
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4941 st = symtable_init();
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4942 if (st == NULL)
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4943 return NULL;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4944 st->st_future = ff;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4945 st->st_filename = filename;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4946 symtable_enter_scope(st, TOP, TYPE(n), n->n_lineno);
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4947 if (st->st_errors > 0)
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4948 goto fail;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4949 symtable_node(st, n);
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4950 if (st->st_errors > 0)
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4951 goto fail;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4952 return st;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4953 fail:
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4954 if (!PyErr_Occurred()) {
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4955 /* This could happen because after a syntax error is
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4956 detected, the symbol-table-building continues for
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4957 a while, and PyErr_Clear() might erroneously be
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4958 called during that process. One such case has been
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4959 fixed, but there might be more (now or later).
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4960 */
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4961 PyErr_SetString(PyExc_SystemError, "lost exception");
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4962 }
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4963 st->st_future = NULL;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4964 st->st_filename = NULL;
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4965 PySymtable_Free(st);
3442e7cdace8 SF patch 763201: handling of SyntaxErrors in symbol table build Jeremy Hylton <jeremy@alum.mit.edu> parents: 29559 diff changeset	4966 return NULL;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4967 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4968
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4969 static int
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4970 symtable_init_compiling_symbols(struct compiling *c)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4971 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4972 PyObject *varnames;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4973
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4974 varnames = c->c_symtable->st_cur->ste_varnames;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4975 if (varnames == NULL) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4976 varnames = PyList_New(0);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4977 if (varnames == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4978 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4979 c->c_symtable->st_cur->ste_varnames = varnames;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4980 Py_INCREF(varnames);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4981 } else
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4982 Py_INCREF(varnames);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4983 c->c_varnames = varnames;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4984
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4985 c->c_globals = PyDict_New();
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4986 if (c->c_globals == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4987 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4988 c->c_freevars = PyDict_New();
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4989 if (c->c_freevars == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4990 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4991 c->c_cellvars = PyDict_New();
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4992 if (c->c_cellvars == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4993 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4994 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4995 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4996
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4997 struct symbol_info {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4998 int si_nlocals;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4999 int si_ncells;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5000 int si_nfrees;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5001 int si_nimplicit;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5002 };
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5003
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5004 static void
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5005 symtable_init_info(struct symbol_info *si)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5006 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5007 si->si_nlocals = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5008 si->si_ncells = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5009 si->si_nfrees = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5010 si->si_nimplicit = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5011 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5012
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5013 static int
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5014 symtable_resolve_free(struct compiling c, PyObject name, int flags,
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5015 struct symbol_info *si)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5016 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5017 PyObject dict, v;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5018
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5019 /* Seperate logic for DEF_FREE. If it occurs in a function,
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5020 it indicates a local that we must allocate storage for (a
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5021 cell var). If it occurs in a class, then the class has a
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5022 method and a free variable with the same name.
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5023 */
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5024 if (c->c_symtable->st_cur->ste_type == TYPE_FUNCTION) {
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5025 /* If it isn't declared locally, it can't be a cell. */
8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5026 if (!(flags & (DEF_LOCAL \| DEF_PARAM)))
8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5027 return 0;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5028 v = PyInt_FromLong(si->si_ncells++);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5029 dict = c->c_cellvars;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5030 } else {
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5031 /* If it is free anyway, then there is no need to do
8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5032 anything here.
8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5033 */
8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5034 if (is_free(flags ^ DEF_FREE_CLASS)
17702 e3f0fd38c24b Several small changes. Mostly reformatting, adding parens. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17637 diff changeset	5035 \|\| (flags == DEF_FREE_CLASS))
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5036 return 0;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5037 v = PyInt_FromLong(si->si_nfrees++);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5038 dict = c->c_freevars;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5039 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5040 if (v == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5041 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5042 if (PyDict_SetItem(dict, name, v) < 0) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5043 Py_DECREF(v);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5044 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5045 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5046 Py_DECREF(v);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5047 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5048 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5049
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5050 /* If a variable is a cell and an argument, make sure that appears in
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5051 co_cellvars before any variable to its right in varnames.
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5052 */
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5053
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5054
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5055 static int
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5056 symtable_cellvar_offsets(PyObject **cellvars, int argcount,
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5057 PyObject *varnames, int flags)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5058 {
28402 5f5364ac4adb symtable_cellvar_offsets(): This leaked references to little integers Tim Peters <tim.peters@gmail.com> parents: 27846 diff changeset	5059 PyObject *v = NULL;
5f5364ac4adb symtable_cellvar_offsets(): This leaked references to little integers Tim Peters <tim.peters@gmail.com> parents: 27846 diff changeset	5060 PyObject w, d, *list = NULL;
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5061 int i, pos;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5062
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5063 if (flags & CO_VARARGS)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5064 argcount++;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5065 if (flags & CO_VARKEYWORDS)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5066 argcount++;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5067 for (i = argcount; --i >= 0; ) {
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5068 v = PyList_GET_ITEM(varnames, i);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5069 if (PyDict_GetItem(*cellvars, v)) {
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5070 if (list == NULL) {
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5071 list = PyList_New(1);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5072 if (list == NULL)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5073 return -1;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5074 PyList_SET_ITEM(list, 0, v);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5075 Py_INCREF(v);
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5076 } else {
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5077 if (PyList_Insert(list, 0, v) < 0) {
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5078 Py_DECREF(list);
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5079 return -1;
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5080 }
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5081 }
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5082 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5083 }
29223 ea2958bd4271 Remove comment with very long lines that explained what the code used Jeremy Hylton <jeremy@alum.mit.edu> parents: 29199 diff changeset	5084 if (list == NULL)
ea2958bd4271 Remove comment with very long lines that explained what the code used Jeremy Hylton <jeremy@alum.mit.edu> parents: 29199 diff changeset	5085 return 0;
ea2958bd4271 Remove comment with very long lines that explained what the code used Jeremy Hylton <jeremy@alum.mit.edu> parents: 29199 diff changeset	5086
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5087 /* There are cellvars that are also arguments. Create a dict
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5088 to replace cellvars and put the args at the front.
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5089 */
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5090 d = PyDict_New();
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5091 if (d == NULL)
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5092 return -1;
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5093 for (i = PyList_GET_SIZE(list); --i >= 0; ) {
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5094 v = PyInt_FromLong(i);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5095 if (v == NULL)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5096 goto fail;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5097 if (PyDict_SetItem(d, PyList_GET_ITEM(list, i), v) < 0)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5098 goto fail;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5099 if (PyDict_DelItem(*cellvars, PyList_GET_ITEM(list, i)) < 0)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5100 goto fail;
28402 5f5364ac4adb symtable_cellvar_offsets(): This leaked references to little integers Tim Peters <tim.peters@gmail.com> parents: 27846 diff changeset	5101 Py_DECREF(v);
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5102 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5103 pos = 0;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5104 i = PyList_GET_SIZE(list);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5105 Py_DECREF(list);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5106 while (PyDict_Next(*cellvars, &pos, &v, &w)) {
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5107 w = PyInt_FromLong(i++); /* don't care about the old key */
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5108 if (w == NULL)
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5109 goto fail;
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5110 if (PyDict_SetItem(d, v, w) < 0) {
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5111 Py_DECREF(w);
28402 5f5364ac4adb symtable_cellvar_offsets(): This leaked references to little integers Tim Peters <tim.peters@gmail.com> parents: 27846 diff changeset	5112 v = NULL;
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5113 goto fail;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5114 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5115 Py_DECREF(w);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5116 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5117 Py_DECREF(*cellvars);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5118 *cellvars = d;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5119 return 1;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5120 fail:
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5121 Py_DECREF(d);
28402 5f5364ac4adb symtable_cellvar_offsets(): This leaked references to little integers Tim Peters <tim.peters@gmail.com> parents: 27846 diff changeset	5122 Py_XDECREF(v);
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5123 return -1;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5124 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5125
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5126 static int
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5127 symtable_freevar_offsets(PyObject *freevars, int offset)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5128 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5129 PyObject name, v;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5130 int pos;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5131
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5132 /* The cell vars are the first elements of the closure,
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5133 followed by the free vars. Update the offsets in
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5134 c_freevars to account for number of cellvars. */
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5135 pos = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5136 while (PyDict_Next(freevars, &pos, &name, &v)) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5137 int i = PyInt_AS_LONG(v) + offset;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5138 PyObject *o = PyInt_FromLong(i);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5139 if (o == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5140 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5141 if (PyDict_SetItem(freevars, name, o) < 0) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5142 Py_DECREF(o);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5143 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5144 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5145 Py_DECREF(o);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5146 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5147 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5148 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5149
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5150 static int
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5151 symtable_check_unoptimized(struct compiling *c,
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5152 PySymtableEntryObject *ste,
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5153 struct symbol_info *si)
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5154 {
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5155 char buf[300];
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5156
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5157 if (!(si->si_ncells \|\| si->si_nfrees \|\| ste->ste_child_free
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5158 \|\| (ste->ste_nested && si->si_nimplicit)))
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5159 return 0;
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5160
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5161 #define ILLEGAL_CONTAINS "contains a nested function with free variables"
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5162
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5163 #define ILLEGAL_IS "is a nested function"
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5164
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5165 #define ILLEGAL_IMPORT_STAR \
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5166 "import * is not allowed in function '%.100s' because it %s"
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5167
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5168 #define ILLEGAL_BARE_EXEC \
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5169 "unqualified exec is not allowed in function '%.100s' it %s"
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5170
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5171 #define ILLEGAL_EXEC_AND_IMPORT_STAR \
21834 c1d55a627897 Fix missing space between words. Bugfix candidate. Neal Norwitz <nnorwitz@gmail.com> parents: 21833 diff changeset	5172 "function '%.100s' uses import * and bare exec, which are illegal " \
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5173 "because it %s"
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5174
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5175 /* XXX perhaps the linenos for these opt-breaking statements
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5176 should be stored so the exception can point to them. */
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5177
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5178 if (ste->ste_child_free) {
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5179 if (ste->ste_optimized == OPT_IMPORT_STAR)
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5180 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5181 ILLEGAL_IMPORT_STAR,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5182 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5183 ILLEGAL_CONTAINS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5184 else if (ste->ste_optimized == (OPT_BARE_EXEC \| OPT_EXEC))
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5185 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5186 ILLEGAL_BARE_EXEC,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5187 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5188 ILLEGAL_CONTAINS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5189 else {
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5190 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5191 ILLEGAL_EXEC_AND_IMPORT_STAR,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5192 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5193 ILLEGAL_CONTAINS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5194 }
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5195 } else {
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5196 if (ste->ste_optimized == OPT_IMPORT_STAR)
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5197 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5198 ILLEGAL_IMPORT_STAR,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5199 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5200 ILLEGAL_IS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5201 else if (ste->ste_optimized == (OPT_BARE_EXEC \| OPT_EXEC))
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5202 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5203 ILLEGAL_BARE_EXEC,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5204 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5205 ILLEGAL_IS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5206 else {
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5207 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5208 ILLEGAL_EXEC_AND_IMPORT_STAR,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5209 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5210 ILLEGAL_IS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5211 }
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5212 }
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	5213
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5214 PyErr_SetString(PyExc_SyntaxError, buf);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5215 PyErr_SyntaxLocation(c->c_symtable->st_filename,
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5216 ste->ste_opt_lineno);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5217 return -1;
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5218 }
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5219
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5220 static int
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5221 symtable_update_flags(struct compiling c, PySymtableEntryObject ste,
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5222 struct symbol_info *si)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5223 {
19158 97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19051 diff changeset	5224 if (c->c_future)
97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19051 diff changeset	5225 c->c_flags \|= c->c_future->ff_features;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	5226 if (ste->ste_generator)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	5227 c->c_flags \|= CO_GENERATOR;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5228 if (ste->ste_type != TYPE_MODULE)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5229 c->c_flags \|= CO_NEWLOCALS;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5230 if (ste->ste_type == TYPE_FUNCTION) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5231 c->c_nlocals = si->si_nlocals;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5232 if (ste->ste_optimized == 0)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5233 c->c_flags \|= CO_OPTIMIZED;
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5234 else if (ste->ste_optimized != OPT_EXEC)
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5235 return symtable_check_unoptimized(c, ste, si);
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5236 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5237 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5238 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5239
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5240 static int
30488 b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5241 symtable_error(struct symtable *st, int lineno)
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5242 {
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5243 if (lineno == 0)
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5244 lineno = st->st_cur->ste_lineno;
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5245 PyErr_SyntaxLocation(st->st_filename, lineno);
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5246 st->st_errors++;
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5247 return -1;
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5248 }
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5249
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5250 static int
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5251 symtable_load_symbols(struct compiling *c)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5252 {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5253 struct symtable *st = c->c_symtable;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5254 PySymtableEntryObject *ste = st->st_cur;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5255 PyObject name, varnames, *v;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5256 int i, flags, pos;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5257 struct symbol_info si;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5258
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5259 v = NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5260
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5261 if (symtable_init_compiling_symbols(c) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5262 goto fail;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5263 symtable_init_info(&si);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5264 varnames = st->st_cur->ste_varnames;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5265 si.si_nlocals = PyList_GET_SIZE(varnames);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5266 c->c_argcount = si.si_nlocals;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5267
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5268 for (i = 0; i < si.si_nlocals; ++i) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5269 v = PyInt_FromLong(i);
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5270 if (v == NULL)
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5271 goto fail;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5272 if (PyDict_SetItem(c->c_locals,
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5273 PyList_GET_ITEM(varnames, i), v) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5274 goto fail;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5275 Py_DECREF(v);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5276 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5277
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5278 /* XXX The cases below define the rules for whether a name is
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5279 local or global. The logic could probably be clearer. */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5280 pos = 0;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5281 while (PyDict_Next(ste->ste_symbols, &pos, &name, &v)) {
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5282 flags = PyInt_AS_LONG(v);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5283
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5284 if (flags & DEF_FREE_GLOBAL)
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5285 /* undo the original DEF_FREE */
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5286 flags &= ~(DEF_FREE \| DEF_FREE_CLASS);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5287
17078 7e181eba6b9b Fixup handling of free variables in methods when the class scope also Jeremy Hylton <jeremy@alum.mit.edu> parents: 17076 diff changeset	5288 /* Deal with names that need two actions:
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5289 1. Cell variables that are also locals.
17078 7e181eba6b9b Fixup handling of free variables in methods when the class scope also Jeremy Hylton <jeremy@alum.mit.edu> parents: 17076 diff changeset	5290 2. Free variables in methods that are also class
7e181eba6b9b Fixup handling of free variables in methods when the class scope also Jeremy Hylton <jeremy@alum.mit.edu> parents: 17076 diff changeset	5291 variables or declared global.
7e181eba6b9b Fixup handling of free variables in methods when the class scope also Jeremy Hylton <jeremy@alum.mit.edu> parents: 17076 diff changeset	5292 */
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5293 if (flags & (DEF_FREE \| DEF_FREE_CLASS))
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5294 symtable_resolve_free(c, name, flags, &si);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5295
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5296 if (flags & DEF_STAR) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5297 c->c_argcount--;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5298 c->c_flags \|= CO_VARARGS;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5299 } else if (flags & DEF_DOUBLESTAR) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5300 c->c_argcount--;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5301 c->c_flags \|= CO_VARKEYWORDS;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5302 } else if (flags & DEF_INTUPLE)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5303 c->c_argcount--;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5304 else if (flags & DEF_GLOBAL) {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5305 if (flags & DEF_PARAM) {
30713 9c7e0227c835 Patch #792869: Clarify error message for parameters declared global, Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	5306 PyErr_Format(PyExc_SyntaxError, PARAM_GLOBAL,
16428 6496844c4a42 Fix symbol table pass to generation SyntaxError exceptions that Jeremy Hylton <jeremy@alum.mit.edu> parents: 16421 diff changeset	5307 PyString_AS_STRING(name));
30488 b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5308 symtable_error(st, 0);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5309 goto fail;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5310 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5311 if (PyDict_SetItem(c->c_globals, name, Py_None) < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5312 goto fail;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5313 } else if (flags & DEF_FREE_GLOBAL) {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5314 si.si_nimplicit++;
26701 45ab31127bf9 SF # 654960, remove unnecessary static variable Neal Norwitz <nnorwitz@gmail.com> parents: 26670 diff changeset	5315 if (PyDict_SetItem(c->c_globals, name, Py_True) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5316 goto fail;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5317 } else if ((flags & DEF_LOCAL) && !(flags & DEF_PARAM)) {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5318 v = PyInt_FromLong(si.si_nlocals++);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5319 if (v == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5320 goto fail;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5321 if (PyDict_SetItem(c->c_locals, name, v) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5322 goto fail;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5323 Py_DECREF(v);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5324 if (ste->ste_type != TYPE_CLASS)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5325 if (PyList_Append(c->c_varnames, name) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5326 goto fail;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5327 } else if (is_free(flags)) {
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5328 if (ste->ste_nested) {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5329 v = PyInt_FromLong(si.si_nfrees++);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5330 if (v == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5331 goto fail;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5332 if (PyDict_SetItem(c->c_freevars, name, v) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5333 goto fail;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5334 Py_DECREF(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5335 } else {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5336 si.si_nimplicit++;
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5337 if (PyDict_SetItem(c->c_globals, name,
26701 45ab31127bf9 SF # 654960, remove unnecessary static variable Neal Norwitz <nnorwitz@gmail.com> parents: 26670 diff changeset	5338 Py_True) < 0)
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5339 goto fail;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5340 if (st->st_nscopes != 1) {
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5341 v = PyInt_FromLong(flags);
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5342 if (v == NULL)
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5343 goto fail;
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5344 if (PyDict_SetItem(st->st_global,
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5345 name, v))
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5346 goto fail;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5347 Py_DECREF(v);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	5348 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5349 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5350 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5351 }
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5352 assert(PyDict_Size(c->c_freevars) == si.si_nfrees);
8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	5353
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5354 if (si.si_ncells > 1) { /* one cell is always in order */
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5355 if (symtable_cellvar_offsets(&c->c_cellvars, c->c_argcount,
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5356 c->c_varnames, c->c_flags) < 0)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5357 return -1;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	5358 }
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5359 if (symtable_freevar_offsets(c->c_freevars, si.si_ncells) < 0)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5360 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5361 return symtable_update_flags(c, ste, &si);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5362 fail:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5363 /* is this always the right thing to do? */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5364 Py_XDECREF(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5365 return -1;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5366 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5367
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5368 static struct symtable *
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5369 symtable_init()
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5370 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5371 struct symtable *st;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5372
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	5373 st = (struct symtable *)PyObject_MALLOC(sizeof(struct symtable));
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5374 if (st == NULL)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5375 return NULL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5376 st->st_pass = 1;
19160 9d024ae05837 st_nested_scopes was uninitialized trash. Jeremy should fix in a better Tim Peters <tim.peters@gmail.com> parents: 19158 diff changeset	5377
16428 6496844c4a42 Fix symbol table pass to generation SyntaxError exceptions that Jeremy Hylton <jeremy@alum.mit.edu> parents: 16421 diff changeset	5378 st->st_filename = NULL;
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5379 st->st_symbols = NULL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5380 if ((st->st_stack = PyList_New(0)) == NULL)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5381 goto fail;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5382 if ((st->st_symbols = PyDict_New()) == NULL)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5383 goto fail;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5384 st->st_cur = NULL;
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5385 st->st_nscopes = 0;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5386 st->st_errors = 0;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5387 st->st_private = NULL;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5388 return st;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5389 fail:
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5390 PySymtable_Free(st);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5391 return NULL;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5392 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5393
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5394 void
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5395 PySymtable_Free(struct symtable *st)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5396 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5397 Py_XDECREF(st->st_symbols);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5398 Py_XDECREF(st->st_stack);
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	5399 Py_XDECREF(st->st_cur);
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	5400 PyObject_FREE((void *)st);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5401 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5402
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5403 /* When the compiler exits a scope, it must should update the scope's
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5404 free variable information with the list of free variables in its
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5405 children.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5406
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5407 Variables that are free in children and defined in the current
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5408 scope are cellvars.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5409
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5410 If the scope being exited is defined at the top-level (ste_nested is
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5411 false), free variables in children that are not defined here are
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5412 implicit globals.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5413
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5414 */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5415
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5416 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5417 symtable_update_free_vars(struct symtable *st)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5418 {
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5419 int i, j, def;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5420 PyObject o, name, *list = NULL;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5421 PySymtableEntryObject child, ste = st->st_cur;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5422
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5423 if (ste->ste_type == TYPE_CLASS)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5424 def = DEF_FREE_CLASS;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5425 else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5426 def = DEF_FREE;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5427 for (i = 0; i < PyList_GET_SIZE(ste->ste_children); ++i) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5428 int pos = 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5429
29224 858d568ebf76 Use macro to get length of list. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29223 diff changeset	5430 if (list && PyList_SetSlice(list, 0,
858d568ebf76 Use macro to get length of list. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29223 diff changeset	5431 PyList_GET_SIZE(list), 0) < 0)
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5432 return -1;
16754 23c7a0108f59 symtable_update_free_vars(), symtable_undo_free(), Barry Warsaw <barry@python.org> parents: 16753 diff changeset	5433 child = (PySymtableEntryObject *)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5434 PyList_GET_ITEM(ste->ste_children, i);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5435 while (PyDict_Next(child->ste_symbols, &pos, &name, &o)) {
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5436 int flags = PyInt_AS_LONG(o);
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5437 if (!(is_free(flags)))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5438 continue; /* avoids indentation */
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5439 if (list == NULL) {
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5440 list = PyList_New(0);
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5441 if (list == NULL)
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5442 return -1;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5443 }
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5444 ste->ste_child_free = 1;
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5445 if (PyList_Append(list, name) < 0) {
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5446 Py_DECREF(list);
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5447 return -1;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5448 }
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5449 }
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5450 for (j = 0; list && j < PyList_GET_SIZE(list); j++) {
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5451 PyObject *v;
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5452 name = PyList_GET_ITEM(list, j);
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5453 v = PyDict_GetItem(ste->ste_symbols, name);
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5454 /* If a name N is declared global in scope A and
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5455 referenced in scope B contained (perhaps
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5456 indirectly) in A and there are no scopes
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5457 with bindings for N between B and A, then N
17702 e3f0fd38c24b Several small changes. Mostly reformatting, adding parens. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17637 diff changeset	5458 is global in B. Unless A is a class scope,
e3f0fd38c24b Several small changes. Mostly reformatting, adding parens. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17637 diff changeset	5459 because class scopes are not considered for
e3f0fd38c24b Several small changes. Mostly reformatting, adding parens. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17637 diff changeset	5460 nested scopes.
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5461 */
17078 7e181eba6b9b Fixup handling of free variables in methods when the class scope also Jeremy Hylton <jeremy@alum.mit.edu> parents: 17076 diff changeset	5462 if (v && (ste->ste_type != TYPE_CLASS)) {
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5463 int flags = PyInt_AS_LONG(v);
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5464 if (flags & DEF_GLOBAL) {
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5465 symtable_undo_free(st, child->ste_id,
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5466 name);
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5467 continue;
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5468 }
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5469 }
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5470 if (ste->ste_nested) {
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5471 if (symtable_add_def_o(st, ste->ste_symbols,
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5472 name, def) < 0) {
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5473 Py_DECREF(list);
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5474 return -1;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5475 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5476 } else {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5477 if (symtable_check_global(st, child->ste_id,
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5478 name) < 0) {
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5479 Py_DECREF(list);
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5480 return -1;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5481 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5482 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5483 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5484 }
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5485
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	5486 Py_XDECREF(list);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5487 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5488 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5489
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5490 /* If the current scope is a non-nested class or if name is not
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5491 defined in the current, non-nested scope, then it is an implicit
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5492 global in all nested scopes.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5493 */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5494
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5495 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5496 symtable_check_global(struct symtable st, PyObject child, PyObject *name)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5497 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5498 PyObject *o;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5499 int v;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5500 PySymtableEntryObject *ste = st->st_cur;
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5501
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5502 if (ste->ste_type == TYPE_CLASS)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5503 return symtable_undo_free(st, child, name);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5504 o = PyDict_GetItem(ste->ste_symbols, name);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5505 if (o == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5506 return symtable_undo_free(st, child, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5507 v = PyInt_AS_LONG(o);
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5508
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5509 if (is_free(v) \|\| (v & DEF_GLOBAL))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5510 return symtable_undo_free(st, child, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5511 else
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5512 return symtable_add_def_o(st, ste->ste_symbols,
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5513 name, DEF_FREE);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5514 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5515
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5516 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5517 symtable_undo_free(struct symtable st, PyObject id,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5518 PyObject *name)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5519 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5520 int i, v, x;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5521 PyObject *info;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5522 PySymtableEntryObject *ste;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5523
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5524 ste = (PySymtableEntryObject *)PyDict_GetItem(st->st_symbols, id);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5525 if (ste == NULL)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5526 return -1;
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	5527
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5528 info = PyDict_GetItem(ste->ste_symbols, name);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5529 if (info == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5530 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5531 v = PyInt_AS_LONG(info);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5532 if (is_free(v)) {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5533 if (symtable_add_def_o(st, ste->ste_symbols, name,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5534 DEF_FREE_GLOBAL) < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5535 return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5536 } else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5537 /* If the name is defined here or declared global,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5538 then the recursion stops. */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5539 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5540
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5541 for (i = 0; i < PyList_GET_SIZE(ste->ste_children); ++i) {
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5542 PySymtableEntryObject *child;
16754 23c7a0108f59 symtable_update_free_vars(), symtable_undo_free(), Barry Warsaw <barry@python.org> parents: 16753 diff changeset	5543 child = (PySymtableEntryObject *)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5544 PyList_GET_ITEM(ste->ste_children, i);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5545 x = symtable_undo_free(st, child->ste_id, name);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5546 if (x < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5547 return x;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5548 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5549 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5550 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5551
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5552 /* symtable_enter_scope() gets a reference via PySymtableEntry_New().
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5553 This reference is released when the scope is exited, via the DECREF
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5554 in symtable_exit_scope().
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5555 */
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5556
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5557 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5558 symtable_exit_scope(struct symtable *st)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5559 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5560 int end;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5561
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	5562 if (st->st_pass == 1)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5563 symtable_update_free_vars(st);
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5564 Py_DECREF(st->st_cur);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5565 end = PyList_GET_SIZE(st->st_stack) - 1;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5566 st->st_cur = (PySymtableEntryObject *)PyList_GET_ITEM(st->st_stack,
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5567 end);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5568 if (PySequence_DelItem(st->st_stack, end) < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5569 return -1;
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5570 return 0;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5571 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5572
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5573 static void
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5574 symtable_enter_scope(struct symtable st, char name, int type,
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5575 int lineno)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5576 {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5577 PySymtableEntryObject *prev = NULL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5578
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5579 if (st->st_cur) {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5580 prev = st->st_cur;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5581 if (PyList_Append(st->st_stack, (PyObject *)st->st_cur) < 0) {
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5582 st->st_errors++;
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5583 return;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5584 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5585 }
16754 23c7a0108f59 symtable_update_free_vars(), symtable_undo_free(), Barry Warsaw <barry@python.org> parents: 16753 diff changeset	5586 st->st_cur = (PySymtableEntryObject *)
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5587 PySymtableEntry_New(st, name, type, lineno);
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5588 if (st->st_cur == NULL) {
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5589 st->st_errors++;
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5590 return;
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5591 }
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5592 if (strcmp(name, TOP) == 0)
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5593 st->st_global = st->st_cur->ste_symbols;
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	5594 if (prev && st->st_pass == 1) {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5595 if (PyList_Append(prev->ste_children,
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5596 (PyObject *)st->st_cur) < 0)
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5597 st->st_errors++;
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	5598 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5599 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5600
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5601 static int
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5602 symtable_lookup(struct symtable st, char name)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5603 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5604 char buffer[MANGLE_LEN];
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5605 PyObject *v;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5606 int flags;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5607
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	5608 if (_Py_Mangle(st->st_private, name, buffer, sizeof(buffer)))
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5609 name = buffer;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5610 v = PyDict_GetItemString(st->st_cur->ste_symbols, name);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5611 if (v == NULL) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5612 if (PyErr_Occurred())
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5613 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5614 else
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5615 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5616 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5617
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5618 flags = PyInt_AS_LONG(v);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5619 return flags;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5620 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5621
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5622 static int
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5623 symtable_add_def(struct symtable st, char name, int flag)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5624 {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5625 PyObject *s;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5626 char buffer[MANGLE_LEN];
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5627 int ret;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5628
24858 592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5629 /* Warn about None, except inside a tuple (where the assignment
592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5630 code already issues a warning). */
592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5631 if ((flag & DEF_PARAM) && !(flag & DEF_INTUPLE) &&
592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5632 *name == 'N' && strcmp(name, "None") == 0)
592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5633 {
32723 efca55bbba0a Upgrade None assignment SyntaxWarning to a SyntaxError. Raymond Hettinger <python@rcn.com> parents: 32717 diff changeset	5634 PyErr_SetString(PyExc_SyntaxError,
efca55bbba0a Upgrade None assignment SyntaxWarning to a SyntaxError. Raymond Hettinger <python@rcn.com> parents: 32717 diff changeset	5635 "Invalid syntax. Assignment to None.");
efca55bbba0a Upgrade None assignment SyntaxWarning to a SyntaxError. Raymond Hettinger <python@rcn.com> parents: 32717 diff changeset	5636 symtable_error(st, 0);
efca55bbba0a Upgrade None assignment SyntaxWarning to a SyntaxError. Raymond Hettinger <python@rcn.com> parents: 32717 diff changeset	5637 return -1;
24858 592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5638 }
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	5639 if (_Py_Mangle(st->st_private, name, buffer, sizeof(buffer)))
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5640 name = buffer;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5641 if ((s = PyString_InternFromString(name)) == NULL)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5642 return -1;
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5643 ret = symtable_add_def_o(st, st->st_cur->ste_symbols, s, flag);
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5644 Py_DECREF(s);
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5645 return ret;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5646 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5647
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5648 /* Must only be called with mangled names */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5649
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5650 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5651 symtable_add_def_o(struct symtable st, PyObject dict,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5652 PyObject *name, int flag)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5653 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5654 PyObject *o;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5655 int val;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5656
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5657 if ((o = PyDict_GetItem(dict, name))) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5658 val = PyInt_AS_LONG(o);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5659 if ((flag & DEF_PARAM) && (val & DEF_PARAM)) {
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5660 PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT,
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16357 diff changeset	5661 PyString_AsString(name));
30488 b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	5662 return symtable_error(st, 0);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5663 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5664 val \|= flag;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5665 } else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5666 val = flag;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5667 o = PyInt_FromLong(val);
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5668 if (o == NULL)
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5669 return -1;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5670 if (PyDict_SetItem(dict, name, o) < 0) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5671 Py_DECREF(o);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5672 return -1;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5673 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5674 Py_DECREF(o);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5675
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5676 if (flag & DEF_PARAM) {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5677 if (PyList_Append(st->st_cur->ste_varnames, name) < 0)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5678 return -1;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5679 } else if (flag & DEF_GLOBAL) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5680 /* XXX need to update DEF_GLOBAL for other flags too;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5681 perhaps only DEF_FREE_GLOBAL */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5682 if ((o = PyDict_GetItem(st->st_global, name))) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5683 val = PyInt_AS_LONG(o);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5684 val \|= flag;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5685 } else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5686 val = flag;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5687 o = PyInt_FromLong(val);
28955 1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5688 if (o == NULL)
1763d9d3fd9d Patch #708604: Check more function results. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28887 diff changeset	5689 return -1;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5690 if (PyDict_SetItem(st->st_global, name, o) < 0) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5691 Py_DECREF(o);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5692 return -1;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5693 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5694 Py_DECREF(o);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5695 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5696 return 0;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5697 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5698
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5699 #define symtable_add_use(ST, NAME) symtable_add_def((ST), (NAME), USE)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5700
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	5701 /* Look for a yield stmt under n. Return 1 if found, else 0.
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	5702 This hack is used to look inside "if 0:" blocks (which are normally
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	5703 ignored) in case those are the only places a yield occurs (so that this
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	5704 function is a generator). */
18274 86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5705 static int
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5706 look_for_yield(node *n)
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5707 {
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5708 int i;
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5709
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5710 for (i = 0; i < NCH(n); ++i) {
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5711 node *kid = CHILD(n, i);
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5712
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5713 switch (TYPE(kid)) {
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5714
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5715 case classdef:
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5716 case funcdef:
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	5717 case lambdef:
18274 86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5718 /* Stuff in nested functions and classes can't make
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5719 the parent a generator. */
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5720 return 0;
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5721
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5722 case yield_stmt:
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5723 return GENERATOR;
18274 86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5724
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5725 default:
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5726 if (look_for_yield(kid))
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5727 return GENERATOR;
18274 86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5728 }
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5729 }
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5730 return 0;
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5731 }
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5732
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5733 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5734 symtable_node(struct symtable st, node n)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5735 {
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5736 int i;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5737
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5738 loop:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5739 switch (TYPE(n)) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5740 case funcdef: {
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5741 char *func_name;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5742 if (NCH(n) == 6)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5743 symtable_node(st, CHILD(n, 0));
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5744 func_name = STR(RCHILD(n, -4));
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5745 symtable_add_def(st, func_name, DEF_LOCAL);
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5746 symtable_default_args(st, RCHILD(n, -3));
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5747 symtable_enter_scope(st, func_name, TYPE(n), n->n_lineno);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5748 symtable_funcdef(st, n);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5749 symtable_exit_scope(st);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5750 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5751 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5752 case lambdef:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5753 if (NCH(n) == 4)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5754 symtable_default_args(st, CHILD(n, 1));
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5755 symtable_enter_scope(st, "lambda", TYPE(n), n->n_lineno);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5756 symtable_funcdef(st, n);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5757 symtable_exit_scope(st);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5758 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5759 case classdef: {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5760 char tmp, class_name = STR(CHILD(n, 1));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5761 symtable_add_def(st, class_name, DEF_LOCAL);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5762 if (TYPE(CHILD(n, 2)) == LPAR) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5763 node *bases = CHILD(n, 3);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5764 int i;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5765 for (i = 0; i < NCH(bases); i += 2) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5766 symtable_node(st, CHILD(bases, i));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5767 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5768 }
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5769 symtable_enter_scope(st, class_name, TYPE(n), n->n_lineno);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5770 tmp = st->st_private;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5771 st->st_private = class_name;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5772 symtable_node(st, CHILD(n, NCH(n) - 1));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5773 st->st_private = tmp;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5774 symtable_exit_scope(st);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5775 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5776 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5777 case if_stmt:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5778 for (i = 0; i + 3 < NCH(n); i += 4) {
18274 86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5779 if (is_constant_false(NULL, (CHILD(n, i + 1)))) {
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5780 if (st->st_cur->ste_generator == 0)
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5781 st->st_cur->ste_generator =
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5782 look_for_yield(CHILD(n, i+3));
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5783 continue;
18274 86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5784 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5785 symtable_node(st, CHILD(n, i + 1));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5786 symtable_node(st, CHILD(n, i + 3));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5787 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5788 if (i + 2 < NCH(n))
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5789 symtable_node(st, CHILD(n, i + 2));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5790 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5791 case global_stmt:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5792 symtable_global(st, n);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5793 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5794 case import_stmt:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5795 symtable_import(st, n);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5796 break;
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16357 diff changeset	5797 case exec_stmt: {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5798 st->st_cur->ste_optimized \|= OPT_EXEC;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5799 symtable_node(st, CHILD(n, 1));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5800 if (NCH(n) > 2)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5801 symtable_node(st, CHILD(n, 3));
17132 55218e0495bc Set the line number correctly for a nested function with an exec or Jeremy Hylton <jeremy@alum.mit.edu> parents: 17131 diff changeset	5802 else {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5803 st->st_cur->ste_optimized \|= OPT_BARE_EXEC;
17132 55218e0495bc Set the line number correctly for a nested function with an exec or Jeremy Hylton <jeremy@alum.mit.edu> parents: 17131 diff changeset	5804 st->st_cur->ste_opt_lineno = n->n_lineno;
55218e0495bc Set the line number correctly for a nested function with an exec or Jeremy Hylton <jeremy@alum.mit.edu> parents: 17131 diff changeset	5805 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5806 if (NCH(n) > 4)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5807 symtable_node(st, CHILD(n, 5));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5808 break;
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16357 diff changeset	5809
f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16357 diff changeset	5810 }
16680 17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5811 case assert_stmt:
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5812 if (Py_OptimizeFlag)
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5813 return;
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5814 if (NCH(n) == 2) {
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5815 n = CHILD(n, 1);
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5816 goto loop;
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5817 } else {
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5818 symtable_node(st, CHILD(n, 1));
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5819 n = CHILD(n, 3);
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5820 goto loop;
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5821 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5822 case except_clause:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5823 if (NCH(n) == 4)
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5824 symtable_assign(st, CHILD(n, 3), 0);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5825 if (NCH(n) > 1) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5826 n = CHILD(n, 1);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5827 goto loop;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5828 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5829 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5830 case del_stmt:
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5831 symtable_assign(st, CHILD(n, 1), 0);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5832 break;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	5833 case yield_stmt:
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	5834 st->st_cur->ste_generator = 1;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	5835 n = CHILD(n, 1);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	5836 goto loop;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5837 case expr_stmt:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5838 if (NCH(n) == 1)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5839 n = CHILD(n, 0);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5840 else {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5841 if (TYPE(CHILD(n, 1)) == augassign) {
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5842 symtable_assign(st, CHILD(n, 0), 0);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5843 symtable_node(st, CHILD(n, 2));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5844 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5845 } else {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5846 int i;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5847 for (i = 0; i < NCH(n) - 2; i += 2)
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5848 symtable_assign(st, CHILD(n, i), 0);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5849 n = CHILD(n, NCH(n) - 1);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5850 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5851 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5852 goto loop;
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5853 case list_iter:
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	5854 /* only occurs when there are multiple for loops
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	5855 in a list comprehension */
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5856 n = CHILD(n, 0);
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	5857 if (TYPE(n) == list_for)
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	5858 symtable_list_for(st, n);
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	5859 else {
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5860 REQ(n, list_if);
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5861 symtable_node(st, CHILD(n, 1));
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5862 if (NCH(n) == 3) {
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5863 n = CHILD(n, 2);
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5864 goto loop;
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5865 }
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5866 }
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5867 break;
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5868 case for_stmt:
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5869 symtable_assign(st, CHILD(n, 1), 0);
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5870 for (i = 3; i < NCH(n); ++i)
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5871 if (TYPE(CHILD(n, i)) >= single_input)
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5872 symtable_node(st, CHILD(n, i));
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5873 break;
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5874 case arglist:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5875 if (NCH(n) > 1)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5876 for (i = 0; i < NCH(n); ++i) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5877 node *ch = CHILD(n, i);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5878 if (TYPE(ch) == argument && NCH(ch) == 2 &&
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5879 TYPE(CHILD(ch, 1)) == gen_for) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5880 PyErr_SetString(PyExc_SyntaxError,
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5881 "invalid syntax");
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5882 symtable_error(st, n->n_lineno);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5883 return;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5884 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5885 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5886 /* The remaining cases fall through to default except in
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5887 special circumstances. This requires the individual cases
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5888 to be coded with great care, even though they look like
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5889 rather innocuous. Each case must double-check TYPE(n).
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5890 */
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5891 case decorator:
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5892 if (TYPE(n) == decorator) {
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5893 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5894 node name, varname;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5895 name = CHILD(n, 1);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5896 REQ(name, dotted_name);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5897 varname = CHILD(name, 0);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5898 REQ(varname, NAME);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5899 symtable_add_use(st, STR(varname));
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5900 }
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5901 /* fall through */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5902 case argument:
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5903 if (TYPE(n) == argument && NCH(n) == 3) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5904 n = CHILD(n, 2);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5905 goto loop;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5906 }
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5907 else if (TYPE(n) == argument && NCH(n) == 2 &&
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5908 TYPE(CHILD(n, 1)) == gen_for) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5909 symtable_generator_expression(st, n);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5910 break;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5911 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5912 /* fall through */
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5913 case listmaker:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5914 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == list_for) {
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	5915 symtable_list_comprehension(st, n);
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5916 break;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5917 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5918 /* fall through */
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5919 case testlist_gexp:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5920 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == gen_for) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5921 symtable_generator_expression(st, n);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5922 break;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5923 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5924 /* fall through */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	5925
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5926 case atom:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5927 if (TYPE(n) == atom && TYPE(CHILD(n, 0)) == NAME) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5928 symtable_add_use(st, STR(CHILD(n, 0)));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5929 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5930 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5931 /* fall through */
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5932 default:
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5933 /* Walk over every non-token child with a special case
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5934 for one child.
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5935 */
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5936 if (NCH(n) == 1) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5937 n = CHILD(n, 0);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5938 goto loop;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5939 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5940 for (i = 0; i < NCH(n); ++i)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5941 if (TYPE(CHILD(n, i)) >= single_input)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5942 symtable_node(st, CHILD(n, i));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5943 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5944 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5945
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5946 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5947 symtable_funcdef(struct symtable st, node n)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5948 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5949 node *body;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5950
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5951 if (TYPE(n) == lambdef) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5952 if (NCH(n) == 4)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5953 symtable_params(st, CHILD(n, 1));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5954 } else
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32723 diff changeset	5955 symtable_params(st, RCHILD(n, -3));
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5956 body = CHILD(n, NCH(n) - 1);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5957 symtable_node(st, body);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5958 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5959
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5960 /* The next two functions parse the argument tuple.
24858 592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5961 symtable_default_args() checks for names in the default arguments,
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5962 which are references in the defining scope. symtable_params()
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5963 parses the parameter names, which are defined in the function's
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5964 body.
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5965
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5966 varargslist:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5967 (fpdef ['=' test] ',')* ('' NAME [',' '' NAME] \| '*' NAME)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5968 \| fpdef ['=' test] (',' fpdef ['=' test])* [',']
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5969 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5970
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5971 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5972 symtable_default_args(struct symtable st, node n)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5973 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5974 node *c;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5975 int i;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5976
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5977 if (TYPE(n) == parameters) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5978 n = CHILD(n, 1);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5979 if (TYPE(n) == RPAR)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5980 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5981 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5982 REQ(n, varargslist);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5983 for (i = 0; i < NCH(n); i += 2) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5984 c = CHILD(n, i);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5985 if (TYPE(c) == STAR \|\| TYPE(c) == DOUBLESTAR) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5986 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5987 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5988 if (i > 0 && (TYPE(CHILD(n, i - 1)) == EQUAL))
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5989 symtable_node(st, CHILD(n, i));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5990 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5991 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5992
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5993 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5994 symtable_params(struct symtable st, node n)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5995 {
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	5996 int i, complex = -1, ext = 0;
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	5997 node *c = NULL;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5998
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5999 if (TYPE(n) == parameters) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6000 n = CHILD(n, 1);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6001 if (TYPE(n) == RPAR)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6002 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6003 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6004 REQ(n, varargslist);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6005 for (i = 0; i < NCH(n); i += 2) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6006 c = CHILD(n, i);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6007 if (TYPE(c) == STAR \|\| TYPE(c) == DOUBLESTAR) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6008 ext = 1;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6009 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6010 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6011 if (TYPE(c) == test) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6012 continue;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6013 }
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	6014 if (TYPE(CHILD(c, 0)) == NAME)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6015 symtable_add_def(st, STR(CHILD(c, 0)), DEF_PARAM);
26756 ccf0b027b585 Oops. Roll back that last change. It wasn't ready for release. :-( Guido van Rossum <guido@python.org> parents: 26754 diff changeset	6016 else {
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6017 char nbuf[30];
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6018 PyOS_snprintf(nbuf, sizeof(nbuf), ".%d", i);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6019 symtable_add_def(st, nbuf, DEF_PARAM);
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6020 complex = i;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6021 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6022 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6023 if (ext) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6024 c = CHILD(n, i);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6025 if (TYPE(c) == STAR) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6026 i++;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6027 symtable_add_def(st, STR(CHILD(n, i)),
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6028 DEF_PARAM \| DEF_STAR);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6029 i += 2;
16137 883cb0e31bb2 prevent symtable_params() from dereferencing off the end of the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16096 diff changeset	6030 if (i >= NCH(n))
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6031 c = NULL;
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6032 else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6033 c = CHILD(n, i);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6034 }
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6035 if (c && TYPE(c) == DOUBLESTAR) {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6036 i++;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6037 symtable_add_def(st, STR(CHILD(n, i)),
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6038 DEF_PARAM \| DEF_DOUBLESTAR);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6039 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6040 }
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6041 if (complex >= 0) {
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6042 int j;
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6043 for (j = 0; j <= complex; j++) {
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6044 c = CHILD(n, j);
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6045 if (TYPE(c) == COMMA)
16699 7334b2cedda8 Fix for implicit tuple + default arguments, courtesy of Michael Hudson. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16680 diff changeset	6046 c = CHILD(n, ++j);
7334b2cedda8 Fix for implicit tuple + default arguments, courtesy of Michael Hudson. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16680 diff changeset	6047 else if (TYPE(c) == EQUAL)
7334b2cedda8 Fix for implicit tuple + default arguments, courtesy of Michael Hudson. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16680 diff changeset	6048 c = CHILD(n, j += 3);
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6049 if (TYPE(CHILD(c, 0)) == LPAR)
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6050 symtable_params_fplist(st, CHILD(c, 1));
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6051 }
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	6052 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6053 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6054
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6055 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6056 symtable_params_fplist(struct symtable st, node n)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6057 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6058 int i;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6059 node *c;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6060
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6061 REQ(n, fplist);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6062 for (i = 0; i < NCH(n); i += 2) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6063 c = CHILD(n, i);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6064 REQ(c, fpdef);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6065 if (NCH(c) == 1)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6066 symtable_add_def(st, STR(CHILD(c, 0)),
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6067 DEF_PARAM \| DEF_INTUPLE);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6068 else
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6069 symtable_params_fplist(st, CHILD(c, 1));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6070 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6071
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6072 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6073
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6074 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6075 symtable_global(struct symtable st, node n)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6076 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6077 int i;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6078
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	6079 /* XXX It might be helpful to warn about module-level global
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	6080 statements, but it's hard to tell the difference between
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	6081 module-level and a string passed to exec.
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	6082 */
16871 d675d75af839 Warn about global statement at the module level. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16862 diff changeset	6083
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	6084 for (i = 1; i < NCH(n); i += 2) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	6085 char *name = STR(CHILD(n, i));
16783 4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6086 int flags;
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6087
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6088 flags = symtable_lookup(st, name);
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6089 if (flags < 0)
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6090 continue;
16783 4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6091 if (flags && flags != DEF_GLOBAL) {
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6092 char buf[500];
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6093 if (flags & DEF_PARAM) {
30713 9c7e0227c835 Patch #792869: Clarify error message for parameters declared global, Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	6094 PyErr_Format(PyExc_SyntaxError, PARAM_GLOBAL,
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6095 name);
30488 b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	6096 symtable_error(st, 0);
16783 4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6097 return;
16853 05785bdf289c Use the new PyErr_WarnExplicit() API to issue better warnings for Guido van Rossum <guido@python.org> parents: 16838 diff changeset	6098 }
05785bdf289c Use the new PyErr_WarnExplicit() API to issue better warnings for Guido van Rossum <guido@python.org> parents: 16838 diff changeset	6099 else {
05785bdf289c Use the new PyErr_WarnExplicit() API to issue better warnings for Guido van Rossum <guido@python.org> parents: 16838 diff changeset	6100 if (flags & DEF_LOCAL)
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6101 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6102 GLOBAL_AFTER_ASSIGN,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6103 name);
16853 05785bdf289c Use the new PyErr_WarnExplicit() API to issue better warnings for Guido van Rossum <guido@python.org> parents: 16838 diff changeset	6104 else
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6105 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6106 GLOBAL_AFTER_USE, name);
16855 ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	6107 symtable_warn(st, buf);
16783 4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6108 }
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	6109 }
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	6110 symtable_add_def(st, name, DEF_GLOBAL);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	6111 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6112 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6113
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6114 static void
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6115 symtable_list_comprehension(struct symtable st, node n)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6116 {
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6117 /* listmaker: test list_for */
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6118 char tmpname[30];
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	6119
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6120 REQ(n, listmaker);
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6121 PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]",
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6122 ++st->st_cur->ste_tmpname);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6123 symtable_add_def(st, tmpname, DEF_LOCAL);
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6124 symtable_list_for(st, CHILD(n, 1));
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6125 symtable_node(st, CHILD(n, 0));
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6126 --st->st_cur->ste_tmpname;
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6127 }
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6128
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6129 static void
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6130 symtable_generator_expression(struct symtable st, node n)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6131 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6132 /* testlist_gexp: test gen_for */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6133 REQ(CHILD(n, 0), test);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6134 REQ(CHILD(n, 1), gen_for);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6135
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6136 symtable_enter_scope(st, "<genexpr>", TYPE(n), n->n_lineno);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6137 st->st_cur->ste_generator = GENERATOR_EXPRESSION;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6138
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6139 symtable_add_def(st, "[outmost-iterable]", DEF_PARAM);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6140
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6141 symtable_gen_for(st, CHILD(n, 1), 1);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6142 symtable_node(st, CHILD(n, 0));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6143 symtable_exit_scope(st);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6144
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6145 /* for outmost iterable precomputation */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6146 symtable_node(st, CHILD(CHILD(n, 1), 3));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6147 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6148
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6149 static void
29199 cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6150 symtable_list_for(struct symtable st, node n)
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6151 {
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6152 REQ(n, list_for);
cd1c826c98a2 Fix for SF [ 734869 ] Lambda functions in list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 29084 diff changeset	6153 /* list_for: for v in expr [list_iter] */
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	6154 symtable_assign(st, CHILD(n, 1), 0);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6155 symtable_node(st, CHILD(n, 3));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6156 if (NCH(n) == 5)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6157 symtable_node(st, CHILD(n, 4));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6158 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6159
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6160 static void
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6161 symtable_gen_for(struct symtable st, node n, int is_outmost)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6162 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6163 REQ(n, gen_for);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6164
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6165 /* gen_for: for v in test [gen_iter] */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6166 symtable_assign(st, CHILD(n, 1), 0);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6167 if (is_outmost)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6168 symtable_add_use(st, "[outmost-iterable]");
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6169 else
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6170 symtable_node(st, CHILD(n, 3));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6171
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6172 if (NCH(n) == 5)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6173 symtable_gen_iter(st, CHILD(n, 4));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6174 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6175
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6176 static void
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6177 symtable_gen_iter(struct symtable st, node n)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6178 {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6179 REQ(n, gen_iter);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6180
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6181 n = CHILD(n, 0);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6182 if (TYPE(n) == gen_for)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6183 symtable_gen_for(st, n, 0);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6184 else {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6185 REQ(n, gen_if);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6186 symtable_node(st, CHILD(n, 1));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6187
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6188 if (NCH(n) == 3)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6189 symtable_gen_iter(st, CHILD(n, 2));
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6190 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6191 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6192
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6193 static void
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6194 symtable_import(struct symtable st, node n)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6195 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6196 int i;
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16357 diff changeset	6197 /* import_stmt: 'import' dotted_as_name (',' dotted_as_name)*
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6198 \| 'from' dotted_name 'import'
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6199 ('' \| import_as_name (',' import_as_name))
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16357 diff changeset	6200 import_as_name: NAME [NAME NAME]
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6201 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6202 if (STR(CHILD(n, 0))[0] == 'f') { /* from */
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6203 node *dotname = CHILD(n, 1);
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6204 if (strcmp(STR(CHILD(dotname, 0)), "__future__") == 0) {
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6205 /* check for bogus imports */
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6206 if (n->n_lineno >= st->st_future->ff_last_lineno) {
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6207 PyErr_SetString(PyExc_SyntaxError,
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6208 LATE_FUTURE);
30488 b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	6209 symtable_error(st, n->n_lineno);
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6210 return;
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6211 }
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	6212 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6213 if (TYPE(CHILD(n, 3)) == STAR) {
19018 821e35706c07 Fix SF bug [ #445474 ] warn about import * inside functions Jeremy Hylton <jeremy@alum.mit.edu> parents: 18631 diff changeset	6214 if (st->st_cur->ste_type != TYPE_MODULE) {
19021 e5754f048f0b Another bug fix for recent import * warning (caught by Thomas Wouters) Jeremy Hylton <jeremy@alum.mit.edu> parents: 19019 diff changeset	6215 if (symtable_warn(st,
e5754f048f0b Another bug fix for recent import * warning (caught by Thomas Wouters) Jeremy Hylton <jeremy@alum.mit.edu> parents: 19019 diff changeset	6216 "import * only allowed at module level") < 0)
e5754f048f0b Another bug fix for recent import * warning (caught by Thomas Wouters) Jeremy Hylton <jeremy@alum.mit.edu> parents: 19019 diff changeset	6217 return;
19018 821e35706c07 Fix SF bug [ #445474 ] warn about import * inside functions Jeremy Hylton <jeremy@alum.mit.edu> parents: 18631 diff changeset	6218 }
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	6219 st->st_cur->ste_optimized \|= OPT_IMPORT_STAR;
17132 55218e0495bc Set the line number correctly for a nested function with an exec or Jeremy Hylton <jeremy@alum.mit.edu> parents: 17131 diff changeset	6220 st->st_cur->ste_opt_lineno = n->n_lineno;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6221 } else {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6222 for (i = 3; i < NCH(n); i += 2) {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6223 node *c = CHILD(n, i);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6224 if (NCH(c) > 1) /* import as */
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	6225 symtable_assign(st, CHILD(c, 2),
9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	6226 DEF_IMPORT);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6227 else
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	6228 symtable_assign(st, CHILD(c, 0),
9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	6229 DEF_IMPORT);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6230 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6231 }
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	6232 } else {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6233 for (i = 1; i < NCH(n); i += 2) {
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	6234 symtable_assign(st, CHILD(n, i), DEF_IMPORT);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6235 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6236 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6237 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6238
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6239 /* The third argument to symatble_assign() is a flag to be passed to
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6240 symtable_add_def() if it is eventually called. The flag is useful
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6241 to specify the particular type of assignment that should be
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6242 recorded, e.g. an assignment caused by import.
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6243 */
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6244
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6245 static void
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6246 symtable_assign(struct symtable st, node n, int def_flag)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6247 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6248 node *tmp;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6249 int i;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6250
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6251 loop:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6252 switch (TYPE(n)) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6253 case lambdef:
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	6254 /* invalid assignment, e.g. lambda x:x=2. The next
9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	6255 pass will catch this error. */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6256 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6257 case power:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6258 if (NCH(n) > 2) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6259 for (i = 2; i < NCH(n); ++i)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6260 if (TYPE(CHILD(n, i)) != DOUBLESTAR)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6261 symtable_node(st, CHILD(n, i));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6262 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6263 if (NCH(n) > 1) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6264 symtable_node(st, CHILD(n, 0));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6265 symtable_node(st, CHILD(n, 1));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6266 } else {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6267 n = CHILD(n, 0);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6268 goto loop;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6269 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6270 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6271 case listmaker:
17076 85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	6272 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == list_for) {
85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	6273 /* XXX This is an error, but the next pass
85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	6274 will catch it. */
85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	6275 return;
85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	6276 } else {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6277 for (i = 0; i < NCH(n); i += 2)
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6278 symtable_assign(st, CHILD(n, i), def_flag);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6279 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6280 return;
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6281 case testlist_gexp:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6282 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == gen_for) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6283 /* XXX This is an error, but the next pass
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6284 will catch it. */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6285 return;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6286 } else {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6287 for (i = 0; i < NCH(n); i += 2)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6288 symtable_assign(st, CHILD(n, i), def_flag);
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6289 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6290 return;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	6291
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6292 case exprlist:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6293 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	6294 case testlist1:
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6295 if (NCH(n) == 1) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6296 n = CHILD(n, 0);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6297 goto loop;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6298 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6299 else {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6300 int i;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6301 for (i = 0; i < NCH(n); i += 2)
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6302 symtable_assign(st, CHILD(n, i), def_flag);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6303 return;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6304 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6305 case atom:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6306 tmp = CHILD(n, 0);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6307 if (TYPE(tmp) == LPAR \|\| TYPE(tmp) == LSQB) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6308 n = CHILD(n, 1);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6309 goto loop;
17185 f9a30015e8b0 Make it illegal to assign to __debug__ as per Guido's request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17132 diff changeset	6310 } else if (TYPE(tmp) == NAME) {
20939 13df8b6c2b80 Fix SF buf #480096: Assign to __debug__ still allowed Jeremy Hylton <jeremy@alum.mit.edu> parents: 20867 diff changeset	6311 if (strcmp(STR(tmp), "__debug__") == 0) {
13df8b6c2b80 Fix SF buf #480096: Assign to __debug__ still allowed Jeremy Hylton <jeremy@alum.mit.edu> parents: 20867 diff changeset	6312 PyErr_SetString(PyExc_SyntaxError,
13df8b6c2b80 Fix SF buf #480096: Assign to __debug__ still allowed Jeremy Hylton <jeremy@alum.mit.edu> parents: 20867 diff changeset	6313 ASSIGN_DEBUG);
30488 b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	6314 symtable_error(st, n->n_lineno);
b0c3d986f63f Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30432 diff changeset	6315 return;
20939 13df8b6c2b80 Fix SF buf #480096: Assign to __debug__ still allowed Jeremy Hylton <jeremy@alum.mit.edu> parents: 20867 diff changeset	6316 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6317 symtable_add_def(st, STR(tmp), DEF_LOCAL \| def_flag);
17185 f9a30015e8b0 Make it illegal to assign to __debug__ as per Guido's request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17132 diff changeset	6318 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6319 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6320 case dotted_as_name:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6321 if (NCH(n) == 3)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6322 symtable_add_def(st, STR(CHILD(n, 2)),
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6323 DEF_LOCAL \| def_flag);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6324 else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6325 symtable_add_def(st,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6326 STR(CHILD(CHILD(n,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6327 0), 0)),
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6328 DEF_LOCAL \| def_flag);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6329 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6330 case dotted_name:
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6331 symtable_add_def(st, STR(CHILD(n, 0)), DEF_LOCAL \| def_flag);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6332 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6333 case NAME:
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6334 symtable_add_def(st, STR(n), DEF_LOCAL \| def_flag);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6335 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6336 default:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	6337 if (NCH(n) == 0)
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6338 return;
16677 b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	6339 if (NCH(n) == 1) {
b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	6340 n = CHILD(n, 0);
b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	6341 goto loop;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6342 }
16677 b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	6343 /* Should only occur for errors like x + 1 = 1,
b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	6344 which will be caught in the next pass. */
b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	6345 for (i = 0; i < NCH(n); ++i)
b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	6346 if (TYPE(CHILD(n, i)) >= single_input)
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	6347 symtable_assign(st, CHILD(n, i), def_flag);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6348 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	6349 }

Mercurial > cpython-lru_cache-weakref

annotate Python/compile.c @ 33166:2e8d2bdd33de legacy-trunk