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

annotate Python/compile.c @ 24866:f0dbd5b49d8a legacy-trunk

Streamline the fast track for CFunction calls a bit more: there was nothing special done if keyword arguments were present, so test for that earlier and fall through to the normal case if there are any. This ought to slow down CFunction calls with keyword args, but I don't care; it's a tiny (1%) improvement for pystone.

author	Guido van Rossum <guido@python.org>
date	Fri, 16 Aug 2002 16:14:00 +0000
parents	592406e0c9b0
children	be2868a63ed5

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
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	54 #define ILLEGAL_DYNAMIC_SCOPE \
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	55 "%.100s: exec or 'import *' makes names ambiguous in nested scope"
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	56
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	57 #define GLOBAL_AFTER_ASSIGN \
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	58 "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	59
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	60 #define GLOBAL_AFTER_USE \
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	61 "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	62
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	63 #define LOCAL_GLOBAL \
21833 070d392042e3 Fix spelling mistakes. Bugfix candidates. Neal Norwitz <nnorwitz@gmail.com> parents: 21725 diff changeset	64 "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	65
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	66 #define LATE_FUTURE \
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	67 "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	68
17185 f9a30015e8b0 Make it illegal to assign to __debug__ as per Guido's request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17132 diff changeset	69 #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	70 "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	71
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	72 #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	73
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	74 #define OFF(x) offsetof(PyCodeObject, x)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	75
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19915 diff changeset	76 static PyMemberDef code_memberlist[] = {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	77 {"co_argcount", T_INT, OFF(co_argcount), READONLY},
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	78 {"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	79 {"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	80 {"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	81 {"co_code", T_OBJECT, OFF(co_code), READONLY},
92509d304e47 add READONLY to member list. Guido van Rossum <guido@python.org> parents: 544 diff changeset	82 {"co_consts", T_OBJECT, OFF(co_consts), READONLY},
92509d304e47 add READONLY to member list. Guido van Rossum <guido@python.org> parents: 544 diff changeset	83 {"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	84 {"co_varnames", T_OBJECT, OFF(co_varnames), READONLY},
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	85 {"co_freevars", T_OBJECT, OFF(co_freevars), READONLY},
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	86 {"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	87 {"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	88 {"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	89 {"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	90 {"co_lnotab", T_OBJECT, OFF(co_lnotab), READONLY},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	91 {NULL} /* Sentinel */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	92 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	93
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	94 PyDoc_STRVAR(code_doc,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	95 "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	96 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	97 \n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	98 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	99
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	100 static PyObject *
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	101 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	102 {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	103 int argcount;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	104 int nlocals;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	105 int stacksize;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	106 int flags;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	107 PyObject *code;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	108 PyObject *consts;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	109 PyObject *names;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	110 PyObject *varnames;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	111 PyObject *freevars = NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	112 PyObject *cellvars = NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	113 PyObject *filename;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	114 PyObject *name;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	115 int firstlineno;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	116 PyObject *lnotab;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	117
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	118 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	119 &argcount, &nlocals, &stacksize, &flags,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	120 &code,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	121 &PyTuple_Type, &consts,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	122 &PyTuple_Type, &names,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	123 &PyTuple_Type, &varnames,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	124 &filename, &name,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	125 &firstlineno, &lnotab,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	126 &PyTuple_Type, &freevars,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	127 &PyTuple_Type, &cellvars))
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	128 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	129
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	130 if (freevars == NULL \|\| cellvars == NULL) {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	131 PyObject *empty = PyTuple_New(0);
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	132 if (empty == NULL)
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	133 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	134 if (freevars == NULL) {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	135 freevars = empty;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	136 Py_INCREF(freevars);
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	137 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	138 if (cellvars == NULL) {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	139 cellvars = empty;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	140 Py_INCREF(cellvars);
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	141 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	142 Py_DECREF(empty);
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
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	145 if (!PyObject_CheckReadBuffer(code)) {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	146 PyErr_SetString(PyExc_TypeError,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	147 "bytecode object must be a single-segment read-only buffer");
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	148 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	149 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	150
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	151 return (PyObject *)PyCode_New(argcount, nlocals, stacksize, flags,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	152 code, consts, names, varnames,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	153 freevars, cellvars, filename, name,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	154 firstlineno, lnotab);
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	155 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	156
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	157 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	158 code_dealloc(PyCodeObject *co)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	159 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	160 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	161 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	162 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	163 Py_XDECREF(co->co_varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	164 Py_XDECREF(co->co_freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	165 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	166 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	167 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	168 Py_XDECREF(co->co_lnotab);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12538 diff changeset	169 PyObject_DEL(co);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	170 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	171
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	172 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	173 code_repr(PyCodeObject *co)
1029 2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	174 {
2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	175 char buf[500];
2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	176 int lineno = -1;
2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	177 char *filename = "???";
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	178 char *name = "???";
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	179
12278 647bf71912f0 Vladimir Marangozov: This fixes the line number in the string Guido van Rossum <guido@python.org> parents: 12086 diff changeset	180 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	181 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	182 if (co->co_filename && PyString_Check(co->co_filename))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	183 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	184 if (co->co_name && PyString_Check(co->co_name))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	185 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	186 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	187 "<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	188 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	189 return PyString_FromString(buf);
1029 2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	190 }
2f9805c963e8 Give code objects a more useful representation. Guido van Rossum <guido@python.org> parents: 792 diff changeset	191
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	192 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	193 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	194 {
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	195 int cmp;
12333 525b2358721e Patch by Vladimir Marangozov to include the function name when Guido van Rossum <guido@python.org> parents: 12278 diff changeset	196 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	197 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	198 cmp = co->co_argcount - cp->co_argcount;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	199 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	200 cmp = co->co_nlocals - cp->co_nlocals;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	201 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	202 cmp = co->co_flags - cp->co_flags;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	203 if (cmp) return cmp;
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	204 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	205 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	206 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	207 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	208 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	209 if (cmp) return cmp;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	210 cmp = PyObject_Compare(co->co_varnames, cp->co_varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	211 if (cmp) return cmp;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	212 cmp = PyObject_Compare(co->co_freevars, cp->co_freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	213 if (cmp) return cmp;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	214 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	215 return cmp;
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	216 }
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	217
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	218 static long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	219 code_hash(PyCodeObject *co)
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	220 {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	221 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	222 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	223 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	224 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	225 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	226 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	227 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	228 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	229 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	230 h4 = PyObject_Hash(co->co_varnames);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	231 if (h4 == -1) return -1;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	232 h5 = PyObject_Hash(co->co_freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	233 if (h5 == -1) return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	234 h6 = PyObject_Hash(co->co_cellvars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	235 if (h6 == -1) return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	236 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	237 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	238 if (h == -1) h = -2;
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	239 return h;
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	240 }
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	241
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	242 /* 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	243
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	244 PyTypeObject PyCode_Type = {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	245 PyObject_HEAD_INIT(&PyType_Type)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	246 0,
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	247 "code",
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	248 sizeof(PyCodeObject),
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	249 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	250 (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	251 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	252 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	253 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	254 (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	255 (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	256 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	257 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	258 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	259 (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	260 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	261 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	262 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	263 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	264 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	265 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	266 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	267 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	268 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	269 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	270 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	271 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	272 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	273 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	274 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	275 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	276 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	277 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	278 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	279 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	280 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	281 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	282 0, /* tp_alloc */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	283 code_new, /* tp_new */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	284 };
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	285
5287 5af766a1b531 Tweaks to keep the Microsoft compiler quier. Guido van Rossum <guido@python.org> parents: 5264 diff changeset	286 #define NAME_CHARS \
5af766a1b531 Tweaks to keep the Microsoft compiler quier. Guido van Rossum <guido@python.org> parents: 5264 diff changeset	287 "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
5af766a1b531 Tweaks to keep the Microsoft compiler quier. Guido van Rossum <guido@python.org> parents: 5264 diff changeset	288
16006 51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	289 /* 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	290
51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	291 static int
51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	292 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	293 {
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	294 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	295 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	296
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	297 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	298 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	299 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	300 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	301 }
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	302 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	303 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	304 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	305 }
9d625303f914 Reindent a function that was somehow indented by 7 spaces. Also did a Guido van Rossum <guido@python.org> parents: 16428 diff changeset	306 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	307 }
51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	308
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	309 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	310 intern_strings(PyObject *tuple)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	311 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	312 int i;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	313
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	314 for (i = PyTuple_GET_SIZE(tuple); --i >= 0; ) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	315 PyObject *v = PyTuple_GET_ITEM(tuple, i);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	316 if (v == NULL \|\| !PyString_Check(v)) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	317 Py_FatalError("non-string found in code slot");
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	318 PyErr_BadInternalCall();
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	319 return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	320 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	321 PyString_InternInPlace(&PyTuple_GET_ITEM(tuple, i));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	322 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	323 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	324 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	325
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	326 PyCodeObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	327 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	328 PyObject code, PyObject consts, PyObject *names,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	329 PyObject varnames, PyObject freevars, PyObject *cellvars,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	330 PyObject filename, PyObject name, int firstlineno,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	331 PyObject *lnotab)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	332 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	333 PyCodeObject *co;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	334 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	335 /* Check argument types */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	336 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	337 code == NULL \|\|
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	338 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	339 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	340 varnames == NULL \|\| !PyTuple_Check(varnames) \|\|
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	341 freevars == NULL \|\| !PyTuple_Check(freevars) \|\|
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	342 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	343 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	344 filename == NULL \|\| !PyString_Check(filename) \|\|
20947 c555f1e7c4be Use PyObject_CheckReadBuffer(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 20939 diff changeset	345 lnotab == NULL \|\| !PyString_Check(lnotab) \|\|
c555f1e7c4be Use PyObject_CheckReadBuffer(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 20939 diff changeset	346 !PyObject_CheckReadBuffer(code)) {
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	347 PyErr_BadInternalCall();
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	348 return NULL;
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	349 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	350 intern_strings(names);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	351 intern_strings(varnames);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	352 intern_strings(freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	353 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	354 /* 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	355 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	356 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	357 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	358 continue;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	359 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	360 continue;
402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	361 PyString_InternInPlace(&PyTuple_GET_ITEM(consts, i));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	362 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	363 co = PyObject_NEW(PyCodeObject, &PyCode_Type);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	364 if (co != NULL) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	365 co->co_argcount = argcount;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	366 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	367 co->co_stacksize = stacksize;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	368 co->co_flags = flags;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	369 Py_INCREF(code);
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	370 co->co_code = code;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	371 Py_INCREF(consts);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	372 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	373 Py_INCREF(names);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	374 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	375 Py_INCREF(varnames);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	376 co->co_varnames = varnames;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	377 Py_INCREF(freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	378 co->co_freevars = freevars;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	379 Py_INCREF(cellvars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	380 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	381 Py_INCREF(filename);
266 b5826bf29677 Changed and exported newcodeobject() interface, for ".pyc" files. Guido van Rossum <guido@python.org> parents: 238 diff changeset	382 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	383 Py_INCREF(name);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	384 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	385 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	386 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	387 co->co_lnotab = lnotab;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	388 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	389 return co;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	390 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	391
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	392
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	393 /* Data structure used internally */
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	394
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	395 /* 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	396 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	397
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	398 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	399 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	400 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	401
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	402 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	403 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	404 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	405 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	406 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	407
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	408 /* All about c_lnotab.
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	409
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	410 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	411 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	412 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	413
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	414 The array is conceptually a list of
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	415 (bytecode offset increment, line number increment)
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	416 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	417
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	418 byte code offset source code line number
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	419 0 1
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	420 6 2
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	421 50 7
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	422 350 307
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	423 361 308
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	424
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	425 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	426 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	427
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	428 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	429
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	430 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	431 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	432 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	433 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	434 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	435 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	436 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	437 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	438
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	439 lineno = addr = 0
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	440 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	441 addr += addr_incr
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	442 if addr > A:
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	443 return lineno
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	444 lineno += line_incr
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	445
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	446 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	447 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	448 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	449 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	450 255, 0, 45, 255, 0, 45.
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	451 */
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	452
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	453 struct compiling {
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	454 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	455 PyObject c_consts; / list of objects */
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	456 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	457 PyObject c_names; / list of strings (names) */
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	458 PyObject c_name_dict; / inverse of c_names */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	459 PyObject c_globals; / dictionary (value=None) */
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	460 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	461 PyObject c_varnames; / list (inverse of c_locals) */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	462 PyObject c_freevars; / dictionary (value=None) */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	463 PyObject c_cellvars; / list */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	464 int c_nlocals; /* index of next local */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	465 int c_argcount; /* number of top-level arguments */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	466 int c_flags; /* same as co_flags */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	467 int c_nexti; /* index into c_code */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	468 int c_errors; /* counts errors occurred */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	469 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	470 int c_interactive; /* generating code for interactive command */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	471 int c_loops; /* counts nested loops */
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	472 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	473 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	474 int c_nblocks; /* current block stack level */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	475 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	476 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	477 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	478 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	479 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	480 int c_firstlineno;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	481 PyObject c_lnotab; / Table mapping address to line number */
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	482 int c_last_addr, c_last_line, c_lnotab_next;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	483 char c_private; / for private name mangling */
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	484 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	485 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	486 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	487 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	488 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	489 char c_encoding; / source encoding (a borrowed reference) */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	490 };
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	491
17518 f939ce52a734 Make some private symbols static. Guido van Rossum <guido@python.org> parents: 17355 diff changeset	492 static int
f939ce52a734 Make some private symbols static. Guido van Rossum <guido@python.org> parents: 17355 diff changeset	493 is_free(int v)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	494 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	495 if ((v & (USE \| DEF_FREE))
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	496 && !(v & (DEF_LOCAL \| DEF_PARAM \| DEF_GLOBAL)))
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	497 return 1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	498 if (v & DEF_FREE_CLASS)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	499 return 1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	500 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	501 }
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	502
16428 6496844c4a42 Fix symbol table pass to generation SyntaxError exceptions that Jeremy Hylton <jeremy@alum.mit.edu> parents: 16421 diff changeset	503 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	504 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	505 {
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	506 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	507
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	508 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	509 /* 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	510 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	511 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	512 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	513 }
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	514 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	515 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	516 /* 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	517 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	518 return;
46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	519 }
13993 716e1c4e3f78 When raising a SyntaxError, make a best-effort attempt to set the Fred Drake <fdrake@acm.org> parents: 13956 diff changeset	520 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	521 if (v == NULL)
46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	522 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	523
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16831 diff changeset	524 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	525 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	526 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	527 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	528 }
22120 b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	529 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	530 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	531 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	532 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	533 goto exit;
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	534 w = Py_BuildValue("(OO)", v, t);
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	535 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	536 goto exit;
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	537 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	538 } else {
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	539 /* 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	540 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	541 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	542 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	543 }
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	544 exit:
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	545 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	546 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	547 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	548 Py_XDECREF(line);
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	549 }
46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	550
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	551 /* Interface to the block stack */
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	552
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	553 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	554 block_push(struct compiling *c, int type)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	555 {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	556 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	557 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	558 "too many statically nested blocks");
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	559 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	560 else {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	561 c->c_block[c->c_nblocks++] = type;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	562 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	563 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	564
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	565 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	566 block_pop(struct compiling *c, int type)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	567 {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	568 if (c->c_nblocks > 0)
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	569 c->c_nblocks--;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	570 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	571 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	572 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	573 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	574
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	575 /* Prototype forward declarations */
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	576
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	577 static int issue_warning(char , char , int);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	578 static int com_init(struct compiling , char );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	579 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	580 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	581 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	582 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	583 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	584 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	585 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	586 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	587 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	588 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	589 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	590 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	591 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	592 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	593 static void com_addopname(struct compiling , int, node );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	594 static void com_list(struct compiling , node , int);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	595 static void com_list_iter(struct compiling , node , node , char );
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	596 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	597 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	598 static void com_assign_name(struct compiling , 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	599 static PyCodeObject icompile(node , struct compiling *);
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	600 static PyCodeObject jcompile(node , char , struct compiling ,
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	601 PyCompilerFlags *);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	602 static PyObject parsestrplus(struct compiling, node *);
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	603 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	604 static node get_rawdocstring(node );
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	605
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	606 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	607
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	608 /* symtable operations */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	609 static int symtable_build(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	610 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	611 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	612 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	613 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	614 static int symtable_add_def(struct symtable , char , int);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	615 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	616
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	617 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	618 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	619 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	620 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	621 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	622 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	623 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	624 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	625 static void symtable_list_comprehension(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	626
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	627 static int symtable_update_free_vars(struct symtable *);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	628 static int symtable_undo_free(struct symtable , PyObject , PyObject *);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	629 static int symtable_check_global(struct symtable , PyObject , PyObject *);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	630
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	631 /* helper */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	632 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	633 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	634 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	635 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	636 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	637 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	638 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	639
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	640 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	641 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	642 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	643 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	644 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	645 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	646 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	647 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	648 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	649 depth--;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	650 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	651 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	652 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	653
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	654 #define DUMP(N) dump(N, 0, -1)
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	655
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	656 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	657 com_init(struct compiling c, char filename)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	658 {
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	659 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	660 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	661 1000)) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	662 goto fail;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	663 if ((c->c_consts = PyList_New(0)) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	664 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	665 if ((c->c_const_dict = PyDict_New()) == NULL)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	666 goto fail;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	667 if ((c->c_names = PyList_New(0)) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	668 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	669 if ((c->c_name_dict = PyDict_New()) == NULL)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	670 goto fail;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	671 if ((c->c_locals = PyDict_New()) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	672 goto fail;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	673 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	674 1000)) == NULL)
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	675 goto fail;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	676 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	677 c->c_varnames = NULL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	678 c->c_freevars = NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	679 c->c_cellvars = NULL;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	680 c->c_nlocals = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	681 c->c_argcount = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	682 c->c_flags = 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	683 c->c_nexti = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	684 c->c_errors = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	685 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	686 c->c_interactive = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	687 c->c_loops = 0;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	688 c->c_begin = 0;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	689 c->c_nblocks = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	690 c->c_filename = filename;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	691 c->c_name = "?";
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	692 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	693 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	694 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	695 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	696 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	697 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	698 c->c_lnotab_next = 0;
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	699 c->c_tmpname = 0;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	700 c->c_nested = 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	701 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	702 c->c_symtable = NULL;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	703 return 1;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	704
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	705 fail:
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	706 com_free(c);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	707 return 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	708 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	709
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	710 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	711 com_free(struct compiling *c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	712 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	713 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	714 Py_XDECREF(c->c_consts);
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	715 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	716 Py_XDECREF(c->c_names);
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	717 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	718 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	719 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	720 Py_XDECREF(c->c_varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	721 Py_XDECREF(c->c_freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	722 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	723 Py_XDECREF(c->c_lnotab);
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	724 if (c->c_future)
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	725 PyObject_FREE((void *)c->c_future);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	726 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	727
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	728 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	729 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	730 {
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	731 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	732 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	733 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	734 /*
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	735 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	736 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	737 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	738 */
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	739 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	740 }
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	741
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	742 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	743 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	744 {
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	745 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	746 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	747 else
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	748 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	749 }
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	750
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	751 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	752 com_done(struct compiling *c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	753 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	754 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	755 _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	756 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	757 _PyString_Resize(&c->c_lnotab, c->c_lnotab_next);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	758 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	759
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	760 static int
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	761 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	762 {
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	763 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	764 if (offset >= len)
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	765 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	766 return 0;
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	767 }
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	768
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	769 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	770 com_addbyte(struct compiling *c, int byte)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	771 {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	772 /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	773 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	774 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	775 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	776 c->c_errors++;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	777 return;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	778 }
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	779 PyString_AS_STRING(c->c_code)[c->c_nexti++] = byte;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	780 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	781
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	782 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	783 com_addint(struct compiling *c, int x)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	784 {
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	785 com_addbyte(c, x & 0xff);
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	786 com_addbyte(c, x >> 8); /* XXX x should be positive */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	787 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	788
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	789 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	790 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	791 {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	792 char *p;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	793 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	794 return;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	795 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	796 c->c_errors++;
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	797 return;
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	798 }
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	799 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	800 *p++ = addr;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	801 *p++ = line;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	802 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	803 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	804
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	805 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	806 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	807 {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	808 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	809 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	810 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	811 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	812 else {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	813 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	814 int incr_line = lineno - c->c_last_line;
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	815 while (incr_addr > 255) {
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	816 com_add_lnotab(c, 255, 0);
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	817 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	818 }
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	819 while (incr_line > 255) {
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	820 com_add_lnotab(c, incr_addr, 255);
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	821 incr_line -=255;
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	822 incr_addr = 0;
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	823 }
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	824 if (incr_addr > 0 \|\| incr_line > 0)
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	825 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	826 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	827 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	828 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	829 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	830
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	831 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	832 com_addoparg(struct compiling *c, int op, int arg)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	833 {
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	834 int extended_arg = arg >> 16;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	835 if (extended_arg){
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	836 com_addbyte(c, EXTENDED_ARG);
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	837 com_addint(c, extended_arg);
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	838 arg &= 0xffff;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	839 }
5164 8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	840 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	841 com_addint(c, arg);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	842 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	843
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	844 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	845 com_addfwref(struct compiling c, int op, int p_anchor)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	846 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	847 /* Compile a forward reference for backpatching */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	848 int here;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	849 int anchor;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	850 com_addbyte(c, op);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	851 here = c->c_nexti;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	852 anchor = *p_anchor;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	853 *p_anchor = here;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	854 com_addint(c, anchor == 0 ? 0 : here - anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	855 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	856
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	857 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	858 com_backpatch(struct compiling *c, int anchor)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	859 {
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	860 unsigned char code = (unsigned char ) PyString_AS_STRING(c->c_code);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	861 int target = c->c_nexti;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	862 int dist;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	863 int prev;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	864 for (;;) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	865 /* Make the JUMP instruction at anchor point to target */
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	866 prev = code[anchor] + (code[anchor+1] << 8);
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	867 dist = target - (anchor+2);
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	868 code[anchor] = dist & 0xff;
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	869 dist >>= 8;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	870 code[anchor+1] = dist;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	871 dist >>= 8;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	872 if (dist) {
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	873 com_error(c, PyExc_SystemError,
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	874 "com_backpatch: offset too large");
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	875 break;
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	876 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	877 if (!prev)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	878 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	879 anchor -= prev;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	880 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	881 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	882
544 d0baa8300005 Minor changes. Guido van Rossum <guido@python.org> parents: 493 diff changeset	883 /* Handle literals and names uniformly */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	884
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	885 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	886 com_add(struct compiling c, PyObject list, PyObject dict, PyObject v)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	887 {
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	888 PyObject w, t, *np=NULL;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	889 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	890
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	891 t = Py_BuildValue("(OO)", v, v->ob_type);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	892 if (t == NULL)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	893 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	894 w = PyDict_GetItem(dict, t);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	895 if (w != NULL) {
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	896 n = PyInt_AsLong(w);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	897 } else {
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	898 n = PyList_Size(list);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	899 np = PyInt_FromLong(n);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	900 if (np == NULL)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	901 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	902 if (PyList_Append(list, v) != 0)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	903 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	904 if (PyDict_SetItem(dict, t, np) != 0)
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	905 goto fail;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	906 Py_DECREF(np);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	907 }
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	908 Py_DECREF(t);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	909 return n;
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	910 fail:
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	911 Py_XDECREF(np);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	912 Py_XDECREF(t);
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	913 c->c_errors++;
0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	914 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	915 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	916
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	917 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	918 com_addconst(struct compiling c, PyObject v)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	919 {
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	920 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	921 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	922
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	923 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	924 com_addname(struct compiling c, PyObject v)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	925 {
12522 0c28c9cabbda Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12388 diff changeset	926 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	927 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	928
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	929 int
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	930 _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	931 {
4131 6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	932 /* Name mangling: __private becomes _classname__private.
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	933 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	934 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	935 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	936 return 0;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	937 nlen = strlen(name);
4131 6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	938 if (nlen+2 >= maxlen)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	939 return 0; /* Don't mangle __extremely_long_names */
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	940 if (name[nlen-1] == '_' && name[nlen-2] == '_')
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	941 return 0; /* Don't mangle __whatever__ */
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	942 /* Strip leading underscores from class name */
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	943 while (*p == '_')
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	944 p++;
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	945 if (*p == '\0')
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	946 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	947 plen = strlen(p);
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	948 if (plen + nlen >= maxlen)
4131 6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	949 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	950 /* 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	951 buffer[0] = '_';
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	952 strncpy(buffer+1, p, plen);
4131 6b589334e0e9 Afterthough: leave both leading underscores in, Guido van Rossum <guido@python.org> parents: 4130 diff changeset	953 strcpy(buffer+1+plen, name);
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	954 return 1;
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	955 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	956
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	957 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	958 com_addop_name(struct compiling c, int op, char name)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	959 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	960 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	961 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	962 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	963
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	964 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	965 name = buffer;
5009 402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	966 if (name == NULL \|\| (v = PyString_InternFromString(name)) == NULL) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	967 c->c_errors++;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	968 i = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	969 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	970 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	971 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	972 Py_DECREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	973 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	974 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	975 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	976
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	977 #define NAME_LOCAL 0
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	978 #define NAME_GLOBAL 1
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	979 #define NAME_DEFAULT 2
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	980 #define NAME_CLOSURE 3
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	981
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	982 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	983 com_lookup_arg(PyObject dict, PyObject name)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	984 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	985 PyObject *v = PyDict_GetItem(dict, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	986 if (v == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	987 return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	988 else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	989 return PyInt_AS_LONG(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	990 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	991
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	992 static int
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	993 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	994 {
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	995 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	996 char *msg;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	997 if (assigning)
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	998 msg = "assigment to None";
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	999 else
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1000 msg = "deleting None";
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1001 if (issue_warning(msg, c->c_filename, c->c_lineno) < 0) {
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1002 c->c_errors++;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1003 return -1;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1004 }
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1005 }
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1006 return 0;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1007 }
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1008
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1009 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	1010 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	1011 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1012 PyObject *v;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1013 int i, reftype;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1014 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	1015 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	1016 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	1017
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1018 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	1019 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	1020 {
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1021 c->c_errors++;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1022 i = 255;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1023 goto done;
bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	1024 }
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	1025 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	1026 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	1027 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	1028 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	1029 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	1030 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	1031 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1032
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1033 reftype = get_ref_type(c, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1034 switch (reftype) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1035 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	1036 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	1037 scope = NAME_LOCAL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1038 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1039 case GLOBAL_EXPLICIT:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1040 scope = NAME_GLOBAL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1041 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1042 case GLOBAL_IMPLICIT:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1043 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	1044 scope = NAME_GLOBAL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1045 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1046 case FREE:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1047 case CELL:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1048 scope = NAME_CLOSURE;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1049 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	1050 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1051
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1052 i = com_addname(c, v);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1053 if (scope == NAME_LOCAL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1054 i = com_lookup_arg(c->c_locals, v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1055 else if (reftype == FREE)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1056 i = com_lookup_arg(c->c_freevars, v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1057 else if (reftype == CELL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1058 i = com_lookup_arg(c->c_cellvars, v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1059 if (i == -1) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1060 c->c_errors++; /* XXX no exception set */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1061 i = 255;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1062 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	1063 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1064 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	1065
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1066 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	1067 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	1068 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	1069 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	1070 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	1071 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1072 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	1073 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	1074 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1075 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	1076 op = LOAD_NAME;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1077 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1078 case NAME_CLOSURE:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1079 op = LOAD_DEREF;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1080 break;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1081 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1082 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1083 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	1084 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	1085 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	1086 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	1087 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1088 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	1089 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	1090 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1091 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	1092 op = STORE_NAME;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1093 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1094 case NAME_CLOSURE:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1095 op = STORE_DEREF;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1096 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	1097 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1098 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1099 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	1100 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	1101 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	1102 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	1103 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1104 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	1105 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	1106 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1107 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	1108 op = DELETE_NAME;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1109 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1110 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	1111 char buf[500];
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	1112 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	1113 DEL_CLOSURE_ERROR, name);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1114 com_error(c, PyExc_SyntaxError, buf);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1115 i = 255;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1116 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	1117 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1118 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1119 break;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1120 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1121 done:
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1122 com_addoparg(c, op, i);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1123 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1124
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1125 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1126 com_addopname(struct compiling c, int op, node n)
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1127 {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1128 char *name;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1129 char buffer[1000];
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1130 /* 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	1131 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	1132 bothered right now */
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1133 if (TYPE(n) == STAR)
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1134 name = "*";
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1135 else if (TYPE(n) == dotted_name) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1136 char *p = buffer;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1137 int i;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1138 name = buffer;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1139 for (i = 0; i < NCH(n); i += 2) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1140 char *s = STR(CHILD(n, i));
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1141 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	1142 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	1143 "dotted_name too long");
2367 915fabec64a3 fix typo (== for =) in assignment Guido van Rossum <guido@python.org> parents: 2310 diff changeset	1144 name = NULL;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1145 break;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1146 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1147 if (p != buffer)
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1148 *p++ = '.';
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1149 strcpy(p, s);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1150 p = strchr(p, '\0');
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1151 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1152 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1153 else {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1154 REQ(n, NAME);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1155 name = STR(n);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1156 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1157 com_addop_name(c, op, name);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1158 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1159
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1160 static PyObject *
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1161 parsenumber(struct compiling c, char s)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1162 {
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1163 char *end;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1164 long x;
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1165 double dx;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1166 #ifndef WITHOUT_COMPLEX
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1167 int imflag;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1168 #endif
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1169
176 229168a2fe28 Added error checking for numeric constants; added local/global variable Guido van Rossum <guido@python.org> parents: 160 diff changeset	1170 errno = 0;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1171 end = s + strlen(s) - 1;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1172 #ifndef WITHOUT_COMPLEX
3366 c25865884649 only use 'j' for imaginary constants Guido van Rossum <guido@python.org> parents: 3349 diff changeset	1173 imflag = end == 'j' \|\| end == 'J';
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1174 #endif
744 834dd4a77ee2 fix what lint found Guido van Rossum <guido@python.org> parents: 703 diff changeset	1175 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	1176 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	1177 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	1178 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	1179 if (x < 0 && errno == 0) {
24770 d75bd9e5c4d9 Use PyErr_WarnExplicit() to warn about hex/oct constants, so the Guido van Rossum <guido@python.org> parents: 24739 diff changeset	1180 if (PyErr_WarnExplicit(
24818 31d2860089e6 Added a FutureWarning for constructs that will change semantically in Barry Warsaw <barry@python.org> parents: 24808 diff changeset	1181 PyExc_FutureWarning,
24770 d75bd9e5c4d9 Use PyErr_WarnExplicit() to warn about hex/oct constants, so the Guido van Rossum <guido@python.org> parents: 24739 diff changeset	1182 "hex/oct constants > sys.maxint "
d75bd9e5c4d9 Use PyErr_WarnExplicit() to warn about hex/oct constants, so the Guido van Rossum <guido@python.org> parents: 24739 diff changeset	1183 "will return positive values "
d75bd9e5c4d9 Use PyErr_WarnExplicit() to warn about hex/oct constants, so the Guido van Rossum <guido@python.org> parents: 24739 diff changeset	1184 "in Python 2.4 and up",
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1185 c->c_filename,
136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1186 c->c_lineno,
24770 d75bd9e5c4d9 Use PyErr_WarnExplicit() to warn about hex/oct constants, so the Guido van Rossum <guido@python.org> parents: 24739 diff changeset	1187 NULL,
d75bd9e5c4d9 Use PyErr_WarnExplicit() to warn about hex/oct constants, so the Guido van Rossum <guido@python.org> parents: 24739 diff changeset	1188 NULL) < 0)
24736 ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24630 diff changeset	1189 return NULL;
24739 eec6832818a3 Reset errno to zero after calling PyErr_Warn(). It can potentially do Guido van Rossum <guido@python.org> parents: 24736 diff changeset	1190 errno = 0; /* Might be changed by PyErr_Warn() */
24736 ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24630 diff changeset	1191 }
ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24630 diff changeset	1192 }
617 755bb8efcc2d Use strtoul() for oct/hex constants. Guido van Rossum <guido@python.org> parents: 584 diff changeset	1193 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1194 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	1195 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	1196 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	1197 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	1198 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	1199 }
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1200 /* XXX Huge floats may silently fail */
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1201 #ifndef WITHOUT_COMPLEX
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1202 if (imflag) {
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1203 Py_complex z;
136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1204 z.real = 0.;
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1205 PyFPE_START_PROTECT("atof", return 0)
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1206 z.imag = atof(s);
136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1207 PyFPE_END_PROTECT(z)
136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1208 return PyComplex_FromCComplex(z);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1209 }
6453 c9b139b9c5ff Fixed for WITHOUT_COMPLEX compilation (Jack) Guido van Rossum <guido@python.org> parents: 6186 diff changeset	1210 else
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1211 #endif
6453 c9b139b9c5ff Fixed for WITHOUT_COMPLEX compilation (Jack) Guido van Rossum <guido@python.org> parents: 6186 diff changeset	1212 {
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1213 PyFPE_START_PROTECT("atof", return 0)
bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1214 dx = atof(s);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5183 diff changeset	1215 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	1216 return PyFloat_FromDouble(dx);
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5041 diff changeset	1217 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1218 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1219
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1220 static PyObject *
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1221 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	1222 {
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1223 #ifndef Py_USING_UNICODE
24630 43caa212b959 Use Py_FatalError instead of abort. Martin v. Löwis <martin@v.loewis.de> parents: 24624 diff changeset	1224 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	1225 return NULL;
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1226 #else
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1227 PyObject u, v;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1228 char s, t;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1229 t = s = *sPtr;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1230 /* 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	1231 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	1232 *sPtr = s;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1233 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	1234 if (u == NULL)
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1235 return NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1236 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	1237 Py_DECREF(u);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1238 return v;
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1239 #endif
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1240 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1241
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1242 static PyObject *
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1243 parsestr(struct compiling c, char s)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1244 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1245 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	1246 size_t len;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1247 char *buf;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1248 char *p;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1249 char *end;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24770 diff changeset	1250 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	1251 int rawmode = 0;
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1252 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	1253 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	1254 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	1255
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1256 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	1257 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	1258 quote = *++s;
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1259 unicode = 1;
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1260 }
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1261 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	1262 quote = *++s;
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1263 rawmode = 1;
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1264 }
28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1265 }
1364 132602d854d8 Changes to accept double-quoted strings on input. Guido van Rossum <guido@python.org> parents: 1354 diff changeset	1266 if (quote != '\'' && quote != '\"') {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1267 PyErr_BadInternalCall();
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1268 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1269 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1270 s++;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1271 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	1272 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	1273 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	1274 "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	1275 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	1276 }
1364 132602d854d8 Changes to accept double-quoted strings on input. Guido van Rossum <guido@python.org> parents: 1354 diff changeset	1277 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	1278 PyErr_BadInternalCall();
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1279 return NULL;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1280 }
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1281 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	1282 s += 2;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1283 len -= 2;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1284 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	1285 PyErr_BadInternalCall();
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1286 return NULL;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1287 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	1288 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1289 #ifdef Py_USING_UNICODE
12538 859e500f0760 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12522 diff changeset	1290 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	1291 PyObject u, w;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1292 if (encoding == NULL) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1293 buf = s;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1294 u = NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1295 } 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	1296 buf = s;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1297 u = NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1298 } else {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1299 /* "\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	1300 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	1301 if (u == NULL)
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1302 return NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1303 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	1304 end = s + len;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1305 while (s < end) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1306 if (*s == '\\') {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1307 p++ = s++;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1308 if (*s & 0x80) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1309 strcpy(p, "u005c");
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1310 p += 5;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1311 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1312 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1313 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	1314 char *r;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1315 int rn, i;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1316 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	1317 if (w == NULL) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1318 Py_DECREF(u);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1319 return NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1320 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1321 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	1322 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	1323 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	1324 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	1325 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	1326 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	1327 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	1328 p += 6;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1329 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1330 Py_DECREF(w);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1331 } else {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1332 p++ = s++;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1333 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1334 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1335 len = p - buf;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1336 }
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1337 if (rawmode)
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1338 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	1339 else
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1340 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	1341 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	1342 if (v == NULL)
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1343 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	1344 return v;
b2a2cc0c2a63 Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 21834 diff changeset	1345
11974 28003afa1a2f Marc-Andre Lemburg: support for Unicode string literals (u"...", ur"..."). Guido van Rossum <guido@python.org> parents: 11598 diff changeset	1346 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1347 #endif
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1348 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	1349 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	1350 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	1351 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	1352 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	1353 #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	1354 /* 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	1355 encoding. */
24630 43caa212b959 Use Py_FatalError instead of abort. Martin v. Löwis <martin@v.loewis.de> parents: 24624 diff changeset	1356 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	1357 #else
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1358 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	1359 if (u == NULL)
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1360 return NULL;
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1361 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	1362 Py_DECREF(u);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1363 return v;
24624 6445e44fcb78 Fix PEP 263 code --without-unicode. Fixes #591943. Martin v. Löwis <martin@v.loewis.de> parents: 24539 diff changeset	1364 #endif
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1365 } else {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1366 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	1367 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	1368 }
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24770 diff changeset	1369
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24770 diff changeset	1370 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	1371 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	1372 if (v == NULL)
24854 136b853622cc Minor cleanup of parsename() and parsestr(): the 'struct compiling ' Guido van Rossum <guido@python.org>* parents: 24844 diff changeset	1373 PyErr_SyntaxLocation(c->c_filename, c->c_lineno);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1374 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1375 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1376
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1377 static PyObject *
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1378 parsestrplus(struct compiling* c, node *n)
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1379 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1380 PyObject *v;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1381 int i;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1382 REQ(CHILD(n, 0), STRING);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1383 if ((v = parsestr(c, STR(CHILD(n, 0)))) != NULL) {
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1384 /* String literal concatenation */
12388 c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1385 for (i = 1; i < NCH(n); i++) {
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1386 PyObject *s;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1387 s = parsestr(c, STR(CHILD(n, i)));
12388 c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1388 if (s == NULL)
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1389 goto onError;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1390 if (PyString_Check(v) && PyString_Check(s)) {
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1391 PyString_ConcatAndDel(&v, s);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1392 if (v == NULL)
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1393 goto onError;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1394 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1395 #ifdef Py_USING_UNICODE
12388 c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1396 else {
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1397 PyObject *temp;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1398 temp = PyUnicode_Concat(v, s);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1399 Py_DECREF(s);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1400 if (temp == NULL)
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1401 goto onError;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1402 Py_DECREF(v);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1403 v = temp;
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1404 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1405 #endif
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1406 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1407 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1408 return v;
12388 c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1409
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1410 onError:
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1411 Py_XDECREF(v);
c48172af13dc M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12333 diff changeset	1412 return NULL;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1413 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1414
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1415 static void
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1416 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	1417 {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1418 int anchor = 0;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1419 int save_begin = c->c_begin;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1420
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1421 /* list_iter: for v in expr [list_iter] */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1422 com_node(c, CHILD(n, 3)); /* expr */
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	1423 com_addbyte(c, GET_ITER);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1424 c->c_begin = c->c_nexti;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	1425 com_addfwref(c, FOR_ITER, &anchor);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1426 com_push(c, 1);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1427 com_assign(c, CHILD(n, 1), OP_ASSIGN, NULL);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1428 c->c_loops++;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1429 com_list_iter(c, n, e, t);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1430 c->c_loops--;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1431 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1432 c->c_begin = save_begin;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1433 com_backpatch(c, anchor);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	1434 com_pop(c, 1); /* FOR_ITER has popped this */
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1435 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1436
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1437 static void
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1438 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	1439 {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1440 int anchor = 0;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1441 int a = 0;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1442 /* list_iter: 'if' test [list_iter] */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1443 com_node(c, CHILD(n, 1));
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1444 com_addfwref(c, JUMP_IF_FALSE, &a);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1445 com_addbyte(c, POP_TOP);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1446 com_pop(c, 1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1447 com_list_iter(c, n, e, t);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1448 com_addfwref(c, JUMP_FORWARD, &anchor);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1449 com_backpatch(c, a);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1450 /* We jump here with an extra entry which we now pop */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1451 com_addbyte(c, POP_TOP);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1452 com_backpatch(c, anchor);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1453 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1454
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1455 static void
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1456 com_list_iter(struct compiling *c,
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1457 node p, / parent of list_iter node */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1458 node e, / element expression node */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1459 char t / name of result list temp local */)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1460 {
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1461 /* 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	1462 node *n = CHILD(p, NCH(p)-1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1463 if (TYPE(n) == list_iter) {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1464 n = CHILD(n, 0);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1465 switch (TYPE(n)) {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1466 case list_for:
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1467 com_list_for(c, n, e, t);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1468 break;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1469 case list_if:
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1470 com_list_if(c, n, e, t);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1471 break;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1472 default:
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1473 com_error(c, PyExc_SystemError,
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1474 "invalid list_iter node type");
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1475 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1476 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1477 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	1478 com_addop_varname(c, VAR_LOAD, t);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1479 com_push(c, 1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1480 com_node(c, e);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1481 com_addoparg(c, CALL_FUNCTION, 1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1482 com_addbyte(c, POP_TOP);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1483 com_pop(c, 2);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1484 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1485 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1486
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1487 static void
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1488 com_list_comprehension(struct compiling c, node n)
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1489 {
14117 ac8809959d01 require list comprehensions to start with a for clause Skip Montanaro <skip@pobox.com> parents: 14105 diff changeset	1490 /* listmaker: test list_for */
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	1491 char tmpname[30];
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	1492 PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]", ++c->c_tmpname);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1493 com_addoparg(c, BUILD_LIST, 0);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1494 com_addbyte(c, DUP_TOP); /* leave the result on the stack */
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1495 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	1496 com_addop_name(c, LOAD_ATTR, "append");
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	1497 com_addop_varname(c, VAR_STORE, tmpname);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1498 com_pop(c, 1);
14117 ac8809959d01 require list comprehensions to start with a for clause Skip Montanaro <skip@pobox.com> parents: 14105 diff changeset	1499 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	1500 com_addop_varname(c, VAR_DELETE, tmpname);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1501 --c->c_tmpname;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1502 }
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1503
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1504 static void
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1505 com_listmaker(struct compiling c, node n)
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1506 {
14117 ac8809959d01 require list comprehensions to start with a for clause Skip Montanaro <skip@pobox.com> parents: 14105 diff changeset	1507 /* listmaker: test ( list_for \| (',' test)* [','] ) */
ac8809959d01 require list comprehensions to start with a for clause Skip Montanaro <skip@pobox.com> parents: 14105 diff changeset	1508 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == list_for)
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1509 com_list_comprehension(c, n);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1510 else {
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1511 int len = 0;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1512 int i;
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1513 for (i = 0; i < NCH(n); i += 2, len++)
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1514 com_node(c, CHILD(n, i));
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1515 com_addoparg(c, BUILD_LIST, len);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1516 com_pop(c, len-1);
25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1517 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1518 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1519
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1520 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1521 com_dictmaker(struct compiling c, node n)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1522 {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1523 int i;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1524 /* dictmaker: test ':' test (',' test ':' value)* [','] */
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1525 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	1526 /* 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	1527 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	1528 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	1529 com_push(c, 1);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1530 com_node(c, CHILD(n, i+2)); /* value */
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1531 com_addbyte(c, ROT_TWO);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1532 com_node(c, CHILD(n, i)); /* key */
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1533 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	1534 com_pop(c, 3);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1535 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1536 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1537
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1538 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1539 com_atom(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1540 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1541 node *ch;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1542 PyObject *v;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1543 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1544 REQ(n, atom);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1545 ch = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1546 switch (TYPE(ch)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1547 case LPAR:
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1548 if (TYPE(CHILD(n, 1)) == RPAR) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1549 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	1550 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	1551 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1552 else
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1553 com_node(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1554 break;
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1555 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	1556 if (TYPE(CHILD(n, 1)) == RSQB) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1557 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	1558 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	1559 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1560 else
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1561 com_listmaker(c, CHILD(n, 1));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1562 break;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1563 case LBRACE: /* '{' [dictmaker] '}' */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1564 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	1565 com_push(c, 1);
13936 25fd9846bd54 list comprehensions. see Skip Montanaro <skip@pobox.com> parents: 13930 diff changeset	1566 if (TYPE(CHILD(n, 1)) == dictmaker)
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	1567 com_dictmaker(c, CHILD(n, 1));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1568 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1569 case BACKQUOTE:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1570 com_node(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1571 com_addbyte(c, UNARY_CONVERT);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1572 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1573 case NUMBER:
4315 46d736fb9da3 Added line number to most compile-time error messages. Guido van Rossum <guido@python.org> parents: 4131 diff changeset	1574 if ((v = parsenumber(c, STR(ch))) == NULL) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1575 i = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1576 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1577 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1578 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	1579 Py_DECREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1580 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1581 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	1582 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1583 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1584 case STRING:
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	1585 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	1586 if (v == NULL) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1587 c->c_errors++;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1588 i = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1589 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1590 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1591 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	1592 Py_DECREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1593 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1594 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	1595 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1596 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1597 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	1598 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	1599 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1600 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1601 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1602 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	1603 "com_atom: unexpected node type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1604 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1605 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1606
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1607 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1608 com_slice(struct compiling c, node n, int op)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1609 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1610 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1611 com_addbyte(c, op);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1612 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1613 else if (NCH(n) == 2) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1614 if (TYPE(CHILD(n, 0)) != COLON) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1615 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1616 com_addbyte(c, op+1);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1617 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1618 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1619 com_node(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1620 com_addbyte(c, op+2);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1621 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1622 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1623 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1624 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1625 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1626 com_node(c, CHILD(n, 2));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1627 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	1628 com_pop(c, 2);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1629 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1630 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1631
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1632 static void
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1633 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	1634 {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1635 if (NCH(n) == 1) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1636 com_addbyte(c, DUP_TOP);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1637 com_push(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1638 com_addbyte(c, SLICE);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1639 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1640 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1641 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1642 com_addbyte(c, ROT_TWO);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1643 com_addbyte(c, STORE_SLICE);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1644 com_pop(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1645 } 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	1646 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	1647 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	1648 com_push(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1649 com_addbyte(c, SLICE+1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1650 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1651 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1652 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1653 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1654 com_addbyte(c, ROT_THREE);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1655 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	1656 com_pop(c, 3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1657 } else if (NCH(n) == 2) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1658 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	1659 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	1660 com_push(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1661 com_addbyte(c, SLICE+2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1662 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1663 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1664 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1665 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1666 com_addbyte(c, ROT_THREE);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1667 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	1668 com_pop(c, 3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1669 } else {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1670 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	1671 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	1672 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	1673 com_push(c, 3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1674 com_addbyte(c, SLICE+3);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1675 com_pop(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1676 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1677 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1678 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1679 com_addbyte(c, ROT_FOUR);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1680 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	1681 com_pop(c, 4);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1682 }
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1683 }
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1684
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1685 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1686 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	1687 {
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	1688 node *m;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1689 REQ(n, argument); /* [test '='] test; 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	1690 if (NCH(n) == 1) {
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1691 if (*pkeywords != NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1692 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	1693 "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	1694 }
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	1695 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	1696 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	1697 }
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1698 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	1699 }
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	1700 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	1701 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	1702 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	1703 } 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	1704 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	1705 /* 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	1706 * 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	1707 * 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	1708 * then is very confusing.
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	1709 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1710 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	1711 TYPE(m) == lambdef ?
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	1712 "lambda cannot contain assignment" :
1a5a441772ff Bug #132313 error message confusing for assignment in lambda. Tim Peters <tim.peters@gmail.com> parents: 16638 diff changeset	1713 "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	1714 }
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	1715 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1716 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	1717 (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	1718 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	1719 *pkeywords = PyDict_New();
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	1720 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	1721 c->c_errors++;
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	1722 else if (*pkeywords == NULL) {
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	1723 c->c_errors++;
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	1724 Py_DECREF(v);
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	1725 } else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1726 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	1727 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	1728 "duplicate keyword argument");
32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1729 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1730 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	1731 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	1732 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	1733 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	1734 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	1735 }
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	1736 }
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	1737 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	1738 }
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	1739
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1740 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1741 com_call_function(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1742 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1743 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	1744 com_addoparg(c, CALL_FUNCTION, 0);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1745 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1746 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1747 PyObject *keywords = NULL;
4905 32220c5728f5 Check for duplicate keyword arguments at compile time. Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1748 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	1749 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	1750 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	1751 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	1752 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	1753 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	1754 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	1755 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	1756 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	1757 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	1758 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	1759 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	1760 break;
9625 1fe48009d8ea Add more SET_LINENO instructions in long argument lists Guido van Rossum <guido@python.org> parents: 9293 diff changeset	1761 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	1762 lineno = ch->n_lineno;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	1763 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	1764 }
1fe48009d8ea Add more SET_LINENO instructions in long argument lists Guido van Rossum <guido@python.org> parents: 9293 diff changeset	1765 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	1766 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	1767 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	1768 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	1769 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	1770 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1771 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	1772 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	1773 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	1774 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	1775 i += 3;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	1776 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	1777 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	1778 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	1779 }
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	1780 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	1781 }
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	1782 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	1783 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	1784 "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	1785 }
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	1786 if (star_flag \|\| starstar_flag)
12086 96ea1a800b23 remove reference (vestigal) to CALL_FUNCTION_STAR Jeremy Hylton <jeremy@alum.mit.edu> parents: 12082 diff changeset	1787 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	1788 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	1789 else
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11974 diff changeset	1790 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	1791 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	1792 com_pop(c, na + 2*nk + star_flag + starstar_flag);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1793 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1794 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1795
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1796 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1797 com_select_member(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1798 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1799 com_addopname(c, LOAD_ATTR, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1800 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1801
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1802 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1803 com_sliceobj(struct compiling c, node n)
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1804 {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1805 int i=0;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1806 int ns=2; /* number of slice arguments */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1807 node *ch;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1808
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1809 /* first argument */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1810 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	1811 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	1812 com_push(c, 1);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1813 i++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1814 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1815 else {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1816 com_node(c, CHILD(n,i));
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1817 i++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1818 REQ(CHILD(n,i),COLON);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1819 i++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1820 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1821 /* second argument */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1822 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	1823 com_node(c, CHILD(n,i));
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1824 i++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1825 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1826 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1827 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	1828 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	1829 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1830 /* remaining arguments */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1831 for (; i < NCH(n); i++) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1832 ns++;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1833 ch=CHILD(n,i);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1834 REQ(ch, sliceop);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1835 if (NCH(ch) == 1) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1836 /* 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	1837 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	1838 com_push(c, 1);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1839 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1840 else
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1841 com_node(c, CHILD(ch,1));
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1842 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1843 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	1844 com_pop(c, 1 + (ns == 3));
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1845 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1846
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1847 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1848 com_subscript(struct compiling c, node n)
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1849 {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1850 node *ch;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1851 REQ(n, subscript);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1852 ch = CHILD(n,0);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1853 /* 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	1854 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	1855 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	1856 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	1857 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1858 else {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1859 /* check for slice */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1860 if ((TYPE(ch) == COLON \|\| NCH(n) > 1))
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1861 com_sliceobj(c, n);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1862 else {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1863 REQ(ch, test);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1864 com_node(c, ch);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1865 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1866 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1867 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1868
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1869 static void
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1870 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	1871 {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1872 int i, op;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1873 REQ(n, subscriptlist);
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1874 /* 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	1875 if (NCH(n) == 1) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1876 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	1877 /* '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	1878 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	1879 \|\| (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	1880 && (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	1881 {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1882 switch (assigning) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1883 case OP_DELETE:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1884 op = DELETE_SLICE;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1885 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1886 case OP_ASSIGN:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1887 op = STORE_SLICE;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1888 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1889 case OP_APPLY:
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1890 op = SLICE;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1891 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1892 default:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1893 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	1894 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1895 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1896 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	1897 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	1898 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	1899 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	1900 com_pop(c, 1);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1901 return;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1902 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1903 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1904 /* Else normal subscriptlist. Compile each subscript. */
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1905 for (i = 0; i < NCH(n); i += 2)
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1906 com_subscript(c, CHILD(n, i));
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1907 /* 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	1908 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	1909 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	1910 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	1911 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	1912 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1913 switch (assigning) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1914 case OP_DELETE:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1915 op = DELETE_SUBSCR;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1916 i = 2;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1917 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1918 default:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1919 case OP_ASSIGN:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1920 op = STORE_SUBSCR;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1921 i = 3;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1922 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1923 case OP_APPLY:
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1924 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	1925 i = 1;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1926 break;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	1927 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1928 if (assigning > OP_APPLY) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1929 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	1930 com_push(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1931 com_addbyte(c, BINARY_SUBSCR);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1932 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1933 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1934 com_addbyte(c, assigning);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1935 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1936 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	1937 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1938 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	1939 com_pop(c, i);
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1940 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1941
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1942 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1943 com_apply_trailer(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1944 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1945 REQ(n, trailer);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1946 switch (TYPE(CHILD(n, 0))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1947 case LPAR:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1948 com_call_function(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1949 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1950 case DOT:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1951 com_select_member(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1952 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1953 case LSQB:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1954 com_subscriptlist(c, CHILD(n, 1), OP_APPLY, NULL);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1955 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1956 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1957 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	1958 "com_apply_trailer: unknown trailer type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1959 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1960 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1961
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1962 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	1963 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	1964 {
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1965 int i;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1966 REQ(n, power);
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1967 com_atom(c, CHILD(n, 0));
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1968 for (i = 1; i < NCH(n); i++) {
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1969 if (TYPE(CHILD(n, i)) == DOUBLESTAR) {
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1970 com_factor(c, CHILD(n, i+1));
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1971 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	1972 com_pop(c, 1);
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1973 break;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1974 }
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1975 else
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1976 com_apply_trailer(c, CHILD(n, i));
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1977 }
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1978 }
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1979
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	1980 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	1981 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	1982 {
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	1983 /* 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	1984 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	1985 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	1986 */
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	1987 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	1988 int i;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	1989
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	1990 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	1991 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	1992 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	1993 i = 255;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	1994 else {
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	1995 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	1996 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	1997 PyErr_Clear();
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	1998 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	1999 } else {
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2000 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	2001 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	2002 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2003 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	2004 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2005 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	2006 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	2007 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	2008 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	2009 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2010
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2011 static int
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2012 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	2013 {
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2014 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	2015 int ch;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2016 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	2017 switch (ch) {
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2018 case '0':
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2019 /* 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	2020 break;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2021
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2022 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	2023 /* 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	2024 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	2025 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	2026 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	2027 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	2028 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	2029 return 1;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2030
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2031 case '.':
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2032 found_radix_point = 1;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2033 break;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2034
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2035 default:
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2036 return 0;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2037 }
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2038 }
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2039 return found_radix_point;
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2040 }
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2041
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2042 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2043 com_factor(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2044 {
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2045 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	2046 node pfactor, ppower, patom, pnum;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2047 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	2048 /* 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	2049 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	2050 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	2051 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	2052 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	2053 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	2054 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	2055 */
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2056 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	2057 && NCH(n) == 2
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2058 && 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	2059 && NCH(pfactor) == 1
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2060 && 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	2061 && NCH(ppower) == 1
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2062 && 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	2063 && TYPE((pnum = CHILD(patom, 0))) == NUMBER
e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2064 && !(childtype == MINUS && 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	2065 if (childtype == TILDE) {
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2066 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	2067 return;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2068 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2069 if (childtype == MINUS) {
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	2070 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	2071 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	2072 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	2073 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	2074 return;
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2075 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2076 s[0] = '-';
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2077 strcpy(s + 1, STR(pnum));
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	2078 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	2079 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	2080 }
19793 e2e9f1722c4f SF bug [#458941] Looks like a unary minus bug. Tim Peters <tim.peters@gmail.com> parents: 19613 diff changeset	2081 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	2082 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2083 else if (childtype == PLUS) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2084 com_factor(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2085 com_addbyte(c, UNARY_POSITIVE);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2086 }
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2087 else if (childtype == MINUS) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2088 com_factor(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2089 com_addbyte(c, UNARY_NEGATIVE);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2090 }
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	2091 else if (childtype == TILDE) {
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2092 com_factor(c, CHILD(n, 1));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2093 com_addbyte(c, UNARY_INVERT);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2094 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2095 else {
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2096 com_power(c, CHILD(n, 0));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2097 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2098 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2099
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2100 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2101 com_term(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2102 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2103 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2104 int op;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2105 REQ(n, term);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2106 com_factor(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2107 for (i = 2; i < NCH(n); i += 2) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2108 com_factor(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2109 switch (TYPE(CHILD(n, i-1))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2110 case STAR:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2111 op = BINARY_MULTIPLY;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2112 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2113 case SLASH:
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2114 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	2115 op = BINARY_TRUE_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2116 else
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2117 op = BINARY_DIVIDE;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2118 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2119 case PERCENT:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2120 op = BINARY_MODULO;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2121 break;
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2122 case DOUBLESLASH:
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2123 op = BINARY_FLOOR_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2124 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2125 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2126 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	2127 "com_term: operator not *, /, // or %");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2128 op = 255;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2129 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2130 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	2131 com_pop(c, 1);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2132 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2133 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2134
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2135 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2136 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	2137 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2138 int i;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2139 int op;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2140 REQ(n, arith_expr);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2141 com_term(c, CHILD(n, 0));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2142 for (i = 2; i < NCH(n); i += 2) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2143 com_term(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2144 switch (TYPE(CHILD(n, i-1))) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2145 case PLUS:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2146 op = BINARY_ADD;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2147 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2148 case MINUS:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2149 op = BINARY_SUBTRACT;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2150 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2151 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2152 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	2153 "com_arith_expr: operator not + or -");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2154 op = 255;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2155 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2156 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	2157 com_pop(c, 1);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2158 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2159 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2160
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2161 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2162 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	2163 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2164 int i;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2165 int op;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2166 REQ(n, shift_expr);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2167 com_arith_expr(c, CHILD(n, 0));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2168 for (i = 2; i < NCH(n); i += 2) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2169 com_arith_expr(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2170 switch (TYPE(CHILD(n, i-1))) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2171 case LEFTSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2172 op = BINARY_LSHIFT;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2173 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2174 case RIGHTSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2175 op = BINARY_RSHIFT;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2176 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2177 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2178 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	2179 "com_shift_expr: operator not << or >>");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2180 op = 255;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2181 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2182 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	2183 com_pop(c, 1);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2184 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2185 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2186
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2187 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2188 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	2189 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2190 int i;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2191 int op;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2192 REQ(n, and_expr);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2193 com_shift_expr(c, CHILD(n, 0));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2194 for (i = 2; i < NCH(n); i += 2) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2195 com_shift_expr(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2196 if (TYPE(CHILD(n, i-1)) == AMPER) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2197 op = BINARY_AND;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2198 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2199 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2200 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	2201 "com_and_expr: operator not &");
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2202 op = 255;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2203 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2204 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	2205 com_pop(c, 1);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2206 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2207 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2208
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2209 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2210 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	2211 {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2212 int i;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2213 int op;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2214 REQ(n, xor_expr);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2215 com_and_expr(c, CHILD(n, 0));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2216 for (i = 2; i < NCH(n); i += 2) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2217 com_and_expr(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2218 if (TYPE(CHILD(n, i-1)) == CIRCUMFLEX) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2219 op = BINARY_XOR;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2220 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2221 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2222 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	2223 "com_xor_expr: operator not ^");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2224 op = 255;
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 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	2227 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2228 }
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
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2231 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2232 com_expr(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2233 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2234 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2235 int op;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2236 REQ(n, expr);
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2237 com_xor_expr(c, CHILD(n, 0));
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2238 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	2239 com_xor_expr(c, CHILD(n, i));
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2240 if (TYPE(CHILD(n, i-1)) == VBAR) {
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2241 op = BINARY_OR;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2242 }
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2243 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2244 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	2245 "com_expr: expr operator not \|");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2246 op = 255;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2247 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2248 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	2249 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2250 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2251 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2252
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2253 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	2254 cmp_type(node *n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2255 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2256 REQ(n, comp_op);
388 31d509e94271 Comment out 'abort()' call. Guido van Rossum <guido@python.org> parents: 336 diff changeset	2257 /* comp_op: '<' \| '>' \| '=' \| '>=' \| '<=' \| '<>' \| '!=' \| '=='
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2258 \| 'in' \| 'not' 'in' \| 'is' \| 'is' not' */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2259 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2260 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2261 switch (TYPE(n)) {
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2262 case LESS: return PyCmp_LT;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2263 case GREATER: return PyCmp_GT;
388 31d509e94271 Comment out 'abort()' call. Guido van Rossum <guido@python.org> parents: 336 diff changeset	2264 case EQEQUAL: /* == */
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2265 case EQUAL: return PyCmp_EQ;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2266 case LESSEQUAL: return PyCmp_LE;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2267 case GREATEREQUAL: return PyCmp_GE;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2268 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	2269 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	2270 if (strcmp(STR(n), "is") == 0) return PyCmp_IS;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2271 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2272 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2273 else if (NCH(n) == 2) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2274 switch (TYPE(CHILD(n, 0))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2275 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	2276 return PyCmp_NOT_IN;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2277 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	2278 return PyCmp_IS_NOT;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2279 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2280 }
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21398 diff changeset	2281 return PyCmp_BAD;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2282 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2283
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2284 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2285 com_comparison(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2286 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2287 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2288 enum cmp_op op;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2289 int anchor;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2290 REQ(n, comparison); /* comparison: expr (comp_op expr)* */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2291 com_expr(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2292 if (NCH(n) == 1)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2293 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2294
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2295 /****************************************************************
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2296 The following code is generated for all but the last
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2297 comparison in a chain:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2298
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2299 label: on stack: opcode: jump to:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2300
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2301 a <code to load b>
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2302 a, b DUP_TOP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2303 a, b, b ROT_THREE
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2304 b, a, b COMPARE_OP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2305 b, 0-or-1 JUMP_IF_FALSE L1
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2306 b, 1 POP_TOP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2307 b
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2308
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2309 We are now ready to repeat this sequence for the next
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2310 comparison in the chain.
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2311
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2312 For the last we generate:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2313
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2314 b <code to load c>
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2315 b, c COMPARE_OP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2316 0-or-1
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2317
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2318 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	2319 comparison), we generate:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2320
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2321 0-or-1 JUMP_FORWARD L2
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2322 L1: b, 0 ROT_TWO
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2323 0, b POP_TOP
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2324 0
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2325 L2: 0-or-1
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2326 ****************************************************************/
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2327
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2328 anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2329
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2330 for (i = 2; i < NCH(n); i += 2) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2331 com_expr(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2332 if (i+2 < NCH(n)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2333 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	2334 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2335 com_addbyte(c, ROT_THREE);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2336 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2337 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	2338 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	2339 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	2340 "com_comparison: unknown comparison op");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2341 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2342 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	2343 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2344 if (i+2 < NCH(n)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2345 com_addfwref(c, JUMP_IF_FALSE, &anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2346 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	2347 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2348 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2349 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2350
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2351 if (anchor) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2352 int anchor2 = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2353 com_addfwref(c, JUMP_FORWARD, &anchor2);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2354 com_backpatch(c, anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2355 com_addbyte(c, ROT_TWO);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2356 com_addbyte(c, POP_TOP);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2357 com_backpatch(c, anchor2);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2358 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2359 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2360
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2361 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2362 com_not_test(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2363 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2364 REQ(n, not_test); /* 'not' not_test \| comparison */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2365 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2366 com_comparison(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2367 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2368 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2369 com_not_test(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2370 com_addbyte(c, UNARY_NOT);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2371 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2372 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2373
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2374 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2375 com_and_test(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2376 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2377 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2378 int anchor;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2379 REQ(n, and_test); /* not_test ('and' not_test)* */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2380 anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2381 i = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2382 for (;;) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2383 com_not_test(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2384 if ((i += 2) >= NCH(n))
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2385 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2386 com_addfwref(c, JUMP_IF_FALSE, &anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2387 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	2388 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2389 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2390 if (anchor)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2391 com_backpatch(c, anchor);
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
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2394 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2395 com_make_closure(struct compiling c, PyCodeObject co)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2396 {
21398 de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21179 diff changeset	2397 int i, free = PyCode_GetNumFree(co);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2398 if (free == 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2399 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2400 for (i = 0; i < free; ++i) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2401 /* Bypass com_addop_varname because it will generate
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2402 LOAD_DEREF but LOAD_CLOSURE is needed.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2403 */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2404 PyObject *name = PyTuple_GET_ITEM(co->co_freevars, i);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2405 int arg, reftype;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2406
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2407 /* Special case: If a class contains a method with a
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2408 free variable that has the same name as a method,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2409 the name will be considered free and local in the
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2410 class. It should be handled by the closure, as
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2411 well as by the normal name loookup logic.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2412 */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2413 reftype = get_ref_type(c, PyString_AS_STRING(name));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2414 if (reftype == CELL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2415 arg = com_lookup_arg(c->c_cellvars, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2416 else /* (reftype == FREE) */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2417 arg = com_lookup_arg(c->c_freevars, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2418 if (arg == -1) {
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2419 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	2420 "freevars of %s: %s\n",
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2421 PyObject_REPR(name),
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2422 c->c_name,
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2423 reftype, arg,
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	2424 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	2425 PyObject_REPR(co->co_freevars));
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2426 Py_FatalError("com_make_closure()");
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2427 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2428 com_addoparg(c, LOAD_CLOSURE, arg);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2429
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2430 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2431 com_push(c, free);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2432 return 1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2433 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2434
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2435 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2436 com_test(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2437 {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2438 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	2439 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	2440 PyCodeObject *co;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2441 int i, closure;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2442 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	2443 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	2444 n->n_lineno);
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	2445 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	2446 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	2447 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	2448 return;
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	2449 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2450 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	2451 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	2452 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	2453 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	2454 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	2455 if (closure) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2456 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	2457 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	2458 } else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2459 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	2460 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	2461 com_pop(c, ndefs);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2462 }
1417 f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2463 else {
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2464 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	2465 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	2466 for (;;) {
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2467 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	2468 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	2469 break;
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2470 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	2471 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	2472 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	2473 }
f7edfa6d0dcb change syntactical position of lambdef (was an atom, now is a test) Guido van Rossum <guido@python.org> parents: 1415 diff changeset	2474 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	2475 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	2476 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2477 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2478
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2479 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2480 com_list(struct compiling c, node n, int toplevel)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2481 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2482 /* exprlist: expr (',' expr)* [',']; likewise for testlist */
482 ee899a81570d New argument passing. Guido van Rossum <guido@python.org> parents: 466 diff changeset	2483 if (NCH(n) == 1 && !toplevel) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2484 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2485 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2486 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2487 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2488 int len;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2489 len = (NCH(n) + 1) / 2;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2490 for (i = 0; i < NCH(n); i += 2)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2491 com_node(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2492 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	2493 com_pop(c, len-1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2494 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2495 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2496
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2497
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2498 /* Begin of assignment compilation */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2499
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2500
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2501 static void
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2502 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	2503 {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2504 com_addbyte(c, DUP_TOP);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2505 com_push(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2506 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	2507 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2508 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2509 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2510 com_addbyte(c, ROT_TWO);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2511 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	2512 com_pop(c, 2);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2513 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2514
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2515 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2516 com_assign_attr(struct compiling c, node n, int assigning)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2517 {
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	2518 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	2519 return;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2520 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	2521 com_pop(c, assigning ? 2 : 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2522 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2523
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2524 static void
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2525 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	2526 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2527 REQ(n, trailer);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2528 switch (TYPE(CHILD(n, 0))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2529 case LPAR: /* '(' [exprlist] ')' */
23589 b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2530 if (assigning == OP_DELETE)
b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2531 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	2532 "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	2533 else
b0658feef939 Fix SF bug [ 561825 ] Confusing error for "del f()" Jeremy Hylton <jeremy@alum.mit.edu> parents: 23555 diff changeset	2534 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	2535 "can't assign to function call");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2536 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2537 case DOT: /* '.' NAME */
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2538 if (assigning > OP_APPLY)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2539 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	2540 else
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2541 com_assign_attr(c, CHILD(n, 1), assigning);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2542 break;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	2543 case LSQB: /* '[' subscriptlist ']' */
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2544 com_subscriptlist(c, CHILD(n, 1), assigning, augn);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2545 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2546 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2547 com_error(c, PyExc_SystemError, "unknown trailer type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2548 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2549 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2550
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2551 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	2552 com_assign_sequence(struct compiling c, node n, int assigning)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2553 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2554 int i;
14178 dff22d4a48da Fix allowable node-types for assignment, need to add 'listmaker'. Thomas Wouters <thomas@python.org> parents: 14163 diff changeset	2555 if (TYPE(n) != testlist && TYPE(n) != listmaker)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2556 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	2557 if (assigning) {
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2558 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	2559 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	2560 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	2561 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2562 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	2563 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	2564 }
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2565
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2566 static void
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2567 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	2568 {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2569 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	2570 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	2571 com_push(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2572 com_node(c, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2573 com_addbyte(c, opcode);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2574 com_pop(c, 1);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2575 com_assign_name(c, n, OP_ASSIGN);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2576 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2577
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2578 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2579 com_assign_name(struct compiling c, node n, int assigning)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2580 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2581 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	2582 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	2583 if (assigning)
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2584 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2585 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2586
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2587 static void
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2588 com_assign(struct compiling c, node n, int assigning, node *augn)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2589 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2590 /* Loop to avoid trivial recursion */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2591 for (;;) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2592 switch (TYPE(n)) {
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2593
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2594 case exprlist:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2595 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	2596 case testlist1:
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2597 if (NCH(n) > 1) {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2598 if (assigning > OP_APPLY) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2599 com_error(c, PyExc_SyntaxError,
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	2600 "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	2601 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2602 }
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13884 diff changeset	2603 com_assign_sequence(c, n, assigning);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2604 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2605 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2606 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2607 break;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2608
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2609 case test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2610 case and_test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2611 case not_test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2612 case comparison:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2613 case expr:
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2614 case xor_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2615 case and_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2616 case shift_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	2617 case arith_expr:
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2618 case term:
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2619 case factor:
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2620 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	2621 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	2622 "can't assign to operator");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2623 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2624 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2625 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2626 break;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2627
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	2628 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	2629 ('+'\|'-'\|'~') factor \| atom trailer* */
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2630 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	2631 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	2632 "can't assign to operator");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2633 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2634 }
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2635 if (NCH(n) > 1) { /* trailer or exponent present */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2636 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2637 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2638 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	2639 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	2640 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	2641 "can't assign to operator");
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2642 return;
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	2643 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2644 com_apply_trailer(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2645 } /* NB i is still alive */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2646 com_assign_trailer(c,
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2647 CHILD(n, i), assigning, augn);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2648 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2649 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2650 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2651 break;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2652
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2653 case atom:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2654 switch (TYPE(CHILD(n, 0))) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2655 case LPAR:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2656 n = CHILD(n, 1);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2657 if (TYPE(n) == RPAR) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2658 /* XXX Should allow () = () ??? */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2659 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	2660 "can't assign to ()");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2661 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2662 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2663 if (assigning > OP_APPLY) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2664 com_error(c, PyExc_SyntaxError,
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2665 "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	2666 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2667 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2668 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2669 case LSQB:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2670 n = CHILD(n, 1);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2671 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	2672 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	2673 "can't assign to []");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2674 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2675 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2676 if (assigning > OP_APPLY) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2677 com_error(c, PyExc_SyntaxError,
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2678 "augmented assign to list not possible");
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2679 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2680 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2681 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	2682 && 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	2683 com_error(c, PyExc_SyntaxError,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	2684 "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	2685 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2686 }
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13884 diff changeset	2687 com_assign_sequence(c, n, assigning);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2688 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2689 case NAME:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2690 if (assigning > OP_APPLY)
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2691 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	2692 assigning, augn);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2693 else
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2694 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	2695 assigning);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2696 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2697 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2698 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	2699 "can't assign to literal");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2700 return;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2701 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2702 break;
3963 00722990b80c Removed unused var; added error check for ``lambda: x=1''. Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2703
00722990b80c Removed unused var; added error check for ``lambda: x=1''. Guido van Rossum <guido@python.org> parents: 3839 diff changeset	2704 case lambdef:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2705 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	2706 "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	2707 return;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2708
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2709 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2710 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	2711 "com_assign: bad node");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2712 return;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2713
69 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 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2716 }
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	2717
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2718 static void
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2719 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	2720 {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2721 int opcode;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2722
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2723 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	2724 case '+': opcode = INPLACE_ADD; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2725 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	2726 case '/':
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2727 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	2728 opcode = INPLACE_FLOOR_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2729 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	2730 opcode = INPLACE_TRUE_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2731 else
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2732 opcode = INPLACE_DIVIDE;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 19021 diff changeset	2733 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2734 case '%': opcode = INPLACE_MODULO; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2735 case '<': opcode = INPLACE_LSHIFT; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2736 case '>': opcode = INPLACE_RSHIFT; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2737 case '&': opcode = INPLACE_AND; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2738 case '^': opcode = INPLACE_XOR; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2739 case '\|': opcode = INPLACE_OR; break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2740 case '*':
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2741 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	2742 opcode = INPLACE_POWER;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2743 else
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2744 opcode = INPLACE_MULTIPLY;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2745 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2746 default:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2747 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	2748 return;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2749 }
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2750 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	2751 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2752
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2753 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2754 com_expr_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2755 {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2756 REQ(n, expr_stmt);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2757 /* 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	2758 /* 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	2759 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	2760 return;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2761 if (NCH(n) == 1) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2762 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	2763 if (c->c_interactive)
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	2764 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	2765 else
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	2766 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	2767 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2768 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2769 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	2770 com_augassign(c, n);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2771 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2772 int i;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2773 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	2774 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	2775 if (i+2 < NCH(n)-2) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2776 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	2777 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	2778 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	2779 com_assign(c, CHILD(n, i), OP_ASSIGN, NULL);
69 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 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2783
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2784 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2785 com_assert_stmt(struct compiling c, node n)
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2786 {
23280 9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	2787 int a = 0;
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2788 int i;
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2789 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	2790 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	2791 return;
9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	2792 /* Generate code like
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2793
23280 9e22a8702de2 If Py_OptimizeFlag is false then always evaluate assert conditions, don't Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 23211 diff changeset	2794 if not <test>:
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2795 raise AssertionError [, <message>]
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2796
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2797 where <message> is the second test, if present.
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2798 */
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2799 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	2800 com_addfwref(c, JUMP_IF_TRUE, &a);
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2801 com_addbyte(c, POP_TOP);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2802 com_pop(c, 1);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2803 /* 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	2804 com_addop_name(c, LOAD_GLOBAL, "AssertionError");
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2805 com_push(c, 1);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2806 i = NCH(n)/2; /* Either 2 or 4 */
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2807 if (i > 1)
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2808 com_node(c, CHILD(n, 3));
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2809 com_addoparg(c, RAISE_VARARGS, i);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2810 com_pop(c, i);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2811 /* 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	2812 /* Jump ends up here */
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2813 com_backpatch(c, a);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2814 com_addbyte(c, POP_TOP);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2815 }
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2816
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2817 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2818 com_print_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2819 {
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2820 int i = 1;
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2821 node* stream = NULL;
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2822
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	2823 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	2824
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2825 /* 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	2826 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	2827 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	2828 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	2829 /* stack: [...] => [... stream] */
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	2830 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	2831 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	2832 i = 4;
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2833 else
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2834 i = 3;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2835 }
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2836 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	2837 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	2838 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	2839 /* 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	2840 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	2841 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	2842 /* 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	2843 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	2844 /* 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	2845 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	2846 /* 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	2847 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	2848 }
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2849 else {
14105 d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	2850 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	2851 /* stack: [...] => [... obj] */
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2852 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	2853 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	2854 }
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2855 }
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2856 /* 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	2857 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	2858 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	2859 /* 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	2860 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	2861 /* stack: [... stream] => [...] */
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	2862 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	2863 }
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	2864 }
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	2865 else {
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	2866 if (stream != NULL) {
d809b9b75b99 com_print_stmt(): Guido rightly points out that the stream expression Barry Warsaw <barry@python.org> parents: 14099 diff changeset	2867 /* 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	2868 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	2869 /* stack: [... stream] => [...] */
14099 468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2870 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	2871 }
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2872 else
468481135c49 PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14077 diff changeset	2873 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	2874 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2875 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2876
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2877 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2878 com_return_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2879 {
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	2880 REQ(n, return_stmt); /* 'return' [testlist] */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	2881 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	2882 com_error(c, PyExc_SyntaxError, "'return' outside function");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	2883 }
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	2884 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	2885 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	2886 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	2887 "'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	2888 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2889 }
18243 47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	2890 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	2891 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	2892 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	2893 }
18243 47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	2894 else
47717e5667eb Change the semantics of "return" in generators, as discussed on the Tim Peters <tim.peters@gmail.com> parents: 18228 diff changeset	2895 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	2896 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	2897 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	2898 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	2899
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18065 diff changeset	2900 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	2901 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	2902 {
18228 4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	2903 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	2904 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	2905 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	2906 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	2907 }
18228 4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	2908
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	2909 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	2910 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	2911 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	2912 "'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	2913 "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	2914 return;
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	2915 }
4ebd292c975f Disallow 'yield' in a 'try' block when there's a 'finally' clause. Tim Peters <tim.peters@gmail.com> parents: 18148 diff changeset	2916 }
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	2917 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	2918 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	2919 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2920 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2921
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2922 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2923 com_raise_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2924 {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2925 int i;
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	2926 REQ(n, raise_stmt); /* 'raise' [test [',' test [',' test]]] */
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	2927 if (NCH(n) > 1) {
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	2928 com_node(c, CHILD(n, 1));
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	2929 if (NCH(n) > 3) {
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	2930 com_node(c, CHILD(n, 3));
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	2931 if (NCH(n) > 5)
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	2932 com_node(c, CHILD(n, 5));
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 6501 diff changeset	2933 }
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	2934 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2935 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	2936 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	2937 com_pop(c, i);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2938 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2939
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2940 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	2941 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	2942 {
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	2943 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	2944 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	2945 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	2946 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	2947 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	2948 return;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	2949 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	2950 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	2951 } 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	2952 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	2953 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	2954 }
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	2955
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	2956 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	2957 com_import_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2958 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2959 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2960 REQ(n, import_stmt);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2961 /* 'import' dotted_name (',' dotted_name)* \|
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2962 'from' dotted_name 'import' ('' \| NAME (',' NAME)) */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2963 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	2964 PyObject *tup;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2965 /* 'from' dotted_name 'import' ... */
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	2966 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	2967
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	2968 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	2969 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	2970 } else {
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	2971 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	2972 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	2973 PyTuple_SET_ITEM(tup, (i-3)/2,
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	2974 PyString_FromString(STR(
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	2975 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	2976 }
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	2977 }
1f1a156ed5af Replace the run-time 'future-bytecode-stream-inspection' hack to find out Thomas Wouters <thomas@python.org> parents: 14230 diff changeset	2978 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	2979 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	2980 com_push(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2981 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	2982 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	2983 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	2984 else {
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	2985 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	2986 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	2987 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	2988 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	2989 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2990 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2991 else {
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	2992 /* 'import' ... */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2993 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	2994 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	2995 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	2996 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	2997 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	2998 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	2999 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	3000 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	3001 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	3002 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	3003 "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	3004 return;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13997 diff changeset	3005 }
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	3006 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	3007 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	3008 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	3009 j));
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3010 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	3011 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	3012 } 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	3013 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	3014 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	3015 0)));
4991 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 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3020
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3021 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3022 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	3023 {
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3024 REQ(n, exec_stmt);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3025 /* 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	3026 com_node(c, CHILD(n, 1));
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3027 if (NCH(n) >= 4)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3028 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	3029 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3030 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	3031 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	3032 }
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3033 if (NCH(n) >= 6)
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3034 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	3035 else {
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3036 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	3037 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	3038 }
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3039 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	3040 com_pop(c, 3);
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3041 }
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3042
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3043 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3044 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	3045 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3046 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	3047 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	3048 /* 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	3049
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3050 /* 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	3051 next:
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3052 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	3053
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3054 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	3055 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	3056 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	3057 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	3058 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3059 /* 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	3060 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	3061 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	3062 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	3063 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	3064 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	3065 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	3066 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3067 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3068 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3069
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3070 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	3071 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	3072 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	3073 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	3074 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	3075
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3076 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	3077 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	3078 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	3079 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	3080 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	3081 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	3082 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	3083 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	3084 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	3085 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	3086 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	3087 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	3088 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	3089 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	3090 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	3091 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	3092 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	3093 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	3094 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	3095 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3096 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3097
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3098 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	3099 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	3100 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	3101 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3102
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3103 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	3104 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	3105 if (v == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3106 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	3107 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3108 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3109 i = PyObject_IsTrue(v);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3110 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	3111 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	3112
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3113 case STRING:
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	3114 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	3115 if (v == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3116 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	3117 break;
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3118 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3119 i = PyObject_IsTrue(v);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3120 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	3121 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	3122
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3123 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3124 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	3125 }
8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3126
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3127
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3128 /* 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	3129 * 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	3130 * 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	3131 * pass).
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3132 * 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	3133 */
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3134 static node *
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3135 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	3136 {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3137 int i;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3138
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3139 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	3140 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	3141
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3142 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	3143 case classdef:
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3144 case funcdef:
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3145 case lambdef:
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3146 /* 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	3147 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	3148 return NULL;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3149
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3150 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	3151 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	3152 return kid;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3153 break;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3154
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3155 default: {
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3156 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	3157 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	3158 return bad;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3159 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3160 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3161 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3162
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3163 return NULL;
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3164 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3165
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3166 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3167 com_if_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3168 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3169 int i;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3170 int anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3171 REQ(n, if_stmt);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3172 /'if' test ':' suite ('elif' test ':' suite) ['else' ':' suite] */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3173 for (i = 0; i+3 < NCH(n); i+=4) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3174 int a = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3175 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	3176 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	3177 /* 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	3178 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	3179 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	3180 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	3181 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	3182 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	3183 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	3184 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	3185 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	3186 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	3187 "'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	3188 "inside generator");
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3189 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	3190 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3191 }
5181 8a0b80dc6e71 Added support for ``if __debug__:'' -- if -O is given, this form is Guido van Rossum <guido@python.org> parents: 5164 diff changeset	3192 continue;
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3193 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3194 if (i > 0)
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3195 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	3196 com_node(c, ch);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3197 com_addfwref(c, JUMP_IF_FALSE, &a);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3198 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	3199 com_pop(c, 1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3200 com_node(c, CHILD(n, i+3));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3201 com_addfwref(c, JUMP_FORWARD, &anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3202 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	3203 /* We jump here with an extra entry which we now pop */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3204 com_addbyte(c, POP_TOP);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3205 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3206 if (i+2 < NCH(n))
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3207 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	3208 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	3209 com_backpatch(c, anchor);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3210 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3211
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3212 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3213 com_while_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3214 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3215 int break_anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3216 int anchor = 0;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3217 int save_begin = c->c_begin;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3218 REQ(n, while_stmt); /* 'while' test ':' suite ['else' ':' suite] */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3219 com_addfwref(c, SETUP_LOOP, &break_anchor);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3220 block_push(c, SETUP_LOOP);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3221 c->c_begin = c->c_nexti;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3222 com_set_lineno(c, n->n_lineno);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3223 com_node(c, CHILD(n, 1));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3224 com_addfwref(c, JUMP_IF_FALSE, &anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3225 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	3226 com_pop(c, 1);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3227 c->c_loops++;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3228 com_node(c, CHILD(n, 3));
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3229 c->c_loops--;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3230 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3231 c->c_begin = save_begin;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3232 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	3233 /* We jump here with one entry more on the stack */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3234 com_addbyte(c, POP_TOP);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3235 com_addbyte(c, POP_BLOCK);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3236 block_pop(c, SETUP_LOOP);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3237 if (NCH(n) > 4)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3238 com_node(c, CHILD(n, 6));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3239 com_backpatch(c, break_anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3240 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3241
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3242 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3243 com_for_stmt(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3244 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3245 int break_anchor = 0;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3246 int anchor = 0;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3247 int save_begin = c->c_begin;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3248 REQ(n, for_stmt);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3249 /* 'for' exprlist 'in' exprlist ':' suite ['else' ':' suite] */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3250 com_addfwref(c, SETUP_LOOP, &break_anchor);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3251 block_push(c, SETUP_LOOP);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3252 com_node(c, CHILD(n, 3));
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	3253 com_addbyte(c, GET_ITER);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3254 c->c_begin = c->c_nexti;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3255 com_set_lineno(c, n->n_lineno);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	3256 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	3257 com_push(c, 1);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3258 com_assign(c, CHILD(n, 1), OP_ASSIGN, NULL);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3259 c->c_loops++;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3260 com_node(c, CHILD(n, 5));
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3261 c->c_loops--;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3262 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3263 c->c_begin = save_begin;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3264 com_backpatch(c, anchor);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17518 diff changeset	3265 com_pop(c, 1); /* FOR_ITER has popped this */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3266 com_addbyte(c, POP_BLOCK);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3267 block_pop(c, SETUP_LOOP);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3268 if (NCH(n) > 8)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3269 com_node(c, CHILD(n, 8));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3270 com_backpatch(c, break_anchor);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3271 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3272
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3273 /* 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	3274
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3275 SETUP_FINALLY L
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3276 <code for S>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3277 POP_BLOCK
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3278 LOAD_CONST <nil>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3279 L: <code for Sf>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3280 END_FINALLY
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3281
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3282 The special instructions use the block stack. Each block
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3283 stack entry contains the instruction that created it (here
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3284 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	3285 block stack entry was created, and a label (here L).
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3286
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3287 SETUP_FINALLY:
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3288 Pushes the current value stack level and the label
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3289 onto the block stack.
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3290 POP_BLOCK:
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3291 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	3292 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	3293 block stack. (The label is ignored.)
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3294 END_FINALLY:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3295 Pops a variable number of entries from the value stack
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3296 and re-raises the exception they specify. The number of
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3297 entries popped depends on the (pseudo) exception type.
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3298
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3299 The block stack is unwound when an exception is raised:
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3300 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	3301 onto the value stack (and the exception condition is cleared),
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3302 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	3303 stack.
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3304
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3305 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	3306 (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	3307 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	3308 associated value, and 'exc' the exception.)
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3309
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3310 Value stack Label Instruction Argument
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3311 [] SETUP_EXCEPT L1
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3312 [] <code for S>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3313 [] POP_BLOCK
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3314 [] JUMP_FORWARD L0
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3315
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3316 [tb, val, exc] L1: DUP )
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3317 [tb, val, exc, exc] <evaluate E1> )
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3318 [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	3319 [tb, val, exc, 1-or-0] JUMP_IF_FALSE L2 )
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3320 [tb, val, exc, 1] POP )
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3321 [tb, val, exc] POP
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3322 [tb, val] <assign to V1> (or POP if no V1)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3323 [tb] POP
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3324 [] <code for S1>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3325 JUMP_FORWARD L0
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3326
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3327 [tb, val, exc, 0] L2: POP
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3328 [tb, val, exc] DUP
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3329 .............................etc.......................
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3330
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3331 [tb, val, exc, 0] Ln+1: POP
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3332 [tb, val, exc] END_FINALLY # re-raise exception
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3333
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3334 [] L0: <next statement>
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3335
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3336 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	3337 */
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3338
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3339 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3340 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	3341 {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3342 int except_anchor = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3343 int end_anchor = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3344 int else_anchor = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3345 int i;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3346 node *ch;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3347
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3348 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	3349 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	3350 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	3351 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	3352 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	3353 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	3354 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	3355 for (i = 3;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3356 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	3357 i += 3) {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3358 /* 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	3359 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	3360 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	3361 "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	3362 break;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3363 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3364 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	3365 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	3366 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	3367 if (NCH(ch) > 1) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3368 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	3369 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	3370 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	3371 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	3372 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	3373 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	3374 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	3375 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	3376 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3377 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	3378 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	3379 if (NCH(ch) > 3)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	3380 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	3381 else {
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3382 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	3383 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	3384 }
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3385 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	3386 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	3387 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	3388 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	3389 if (except_anchor) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3390 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	3391 /* 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	3392 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	3393 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	3394 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	3395 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3396 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3397 /* 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	3398 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	3399 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	3400 anything. */
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3401 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	3402 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	3403 if (i < NCH(n))
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3404 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	3405 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	3406 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3407
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3408 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3409 com_try_finally(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3410 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3411 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	3412 node *ch;
792 dc3b455f7632 Only * can be used for varargs argument lists Guido van Rossum <guido@python.org> parents: 744 diff changeset	3413
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3414 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	3415 block_push(c, SETUP_FINALLY);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3416 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	3417 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	3418 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	3419 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	3420 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	3421 /* 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	3422 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	3423 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	3424 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	3425 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	3426 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	3427 ch = CHILD(n, NCH(n)-1);
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3428 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	3429 com_node(c, ch);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3430 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	3431 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	3432 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	3433 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3434
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3435 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3436 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	3437 {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3438 REQ(n, try_stmt);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3439 /* '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	3440 \| 'try' ':' suite 'finally' ':' suite */
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3441 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	3442 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	3443 else
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3444 com_try_except(c, n);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3445 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3446
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3447 static node *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3448 get_rawdocstring(node *n)
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3449 {
2241 fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3450 int i;
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3451
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3452 /* 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	3453 next:
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3454 switch (TYPE(n)) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3455
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3456 case suite:
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3457 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	3458 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	3459 goto next;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3460 }
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3461 /* Fall through */
2241 fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3462 case file_input:
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3463 for (i = 0; i < NCH(n); i++) {
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3464 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	3465 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	3466 n = ch;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3467 goto next;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3468 }
2241 fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3469 }
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3470 break;
fefae37c053c added missing case to get_docstring Guido van Rossum <guido@python.org> parents: 2203 diff changeset	3471
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3472 case stmt:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3473 case simple_stmt:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3474 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	3475 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	3476 goto next;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3477
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3478 case expr_stmt:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3479 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	3480 case testlist1:
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3481 case test:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3482 case and_test:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3483 case not_test:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3484 case comparison:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3485 case expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3486 case xor_expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3487 case and_expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3488 case shift_expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3489 case arith_expr:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3490 case term:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3491 case factor:
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3492 case power:
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3493 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	3494 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	3495 goto next;
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3496 }
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3497 break;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3498
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3499 case atom:
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3500 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	3501 return n;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3502 break;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3503
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3504 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3505 return NULL;
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3506 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3507
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3508 static PyObject *
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	3509 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	3510 {
9987 b7bcc2cda1b3 Implement -OO; "unsafe" optimization that removes docstrings. Guido van Rossum <guido@python.org> parents: 9626 diff changeset	3511 /* 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	3512 if (Py_OptimizeFlag > 1)
b7bcc2cda1b3 Implement -OO; "unsafe" optimization that removes docstrings. Guido van Rossum <guido@python.org> parents: 9626 diff changeset	3513 return NULL;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3514 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	3515 if (n == NULL)
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3516 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	3517 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	3518 }
8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3519
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3520 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3521 com_suite(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3522 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3523 REQ(n, suite);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3524 /* simple_stmt \| NEWLINE INDENT NEWLINE* (stmt NEWLINE)+ DEDENT /
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3525 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3526 com_node(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3527 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3528 else {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3529 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	3530 for (i = 0; i < NCH(n) && c->c_errors == 0; i++) {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3531 node *ch = CHILD(n, i);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3532 if (TYPE(ch) == stmt)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3533 com_node(c, ch);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3534 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3535 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3536 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3537
744 834dd4a77ee2 fix what lint found Guido van Rossum <guido@python.org> parents: 703 diff changeset	3538 /* ARGSUSED */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3539 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3540 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	3541 {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3542 int i = c->c_nblocks;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3543 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	3544 com_addoparg(c, JUMP_ABSOLUTE, c->c_begin);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3545 }
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3546 else if (i <= 0) {
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3547 /* at the outer level */
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3548 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	3549 "'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	3550 }
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3551 else {
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3552 int j;
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3553 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	3554 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	3555 break;
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3556 }
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3557 if (j >= 0) {
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3558 /* there is a loop, but something interferes */
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3559 for (; i > j; --i) {
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3560 if (c->c_block[i] == SETUP_EXCEPT \|\|
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3561 c->c_block[i] == SETUP_FINALLY) {
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3562 com_addoparg(c, CONTINUE_LOOP,
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3563 c->c_begin);
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3564 return;
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3565 }
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3566 if (c->c_block[i] == END_FINALLY) {
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3567 com_error(c, PyExc_SyntaxError,
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3568 "'continue' not supported inside 'finally' clause");
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3569 return;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	3570 }
14471 c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3571 }
c3c49859e80b com_continue_stmt(): Improve error message when continue is found Fred Drake <fdrake@acm.org> parents: 14382 diff changeset	3572 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3573 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	3574 "'continue' not properly in loop");
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3575 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3576 /* XXX Could allow it inside a 'finally' clause
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3577 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	3578 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3579
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3580 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3581 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	3582 {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3583 int i, nch, nargs, ndefs;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3584 if (TYPE(n) == lambdef) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3585 /* lambdef: 'lambda' [varargslist] ':' test */
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3586 n = CHILD(n, 1);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3587 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3588 else {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3589 REQ(n, funcdef); /* funcdef: 'def' NAME parameters ... */
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3590 n = CHILD(n, 2);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3591 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	3592 n = CHILD(n, 1);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3593 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3594 if (TYPE(n) != varargslist)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3595 return 0;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3596 /* varargslist:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3597 (fpdef ['=' test] ',')* '*' ....... \|
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3598 fpdef ['=' test] (',' fpdef ['=' test])* [','] */
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3599 nch = NCH(n);
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3600 nargs = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3601 ndefs = 0;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3602 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	3603 int t;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3604 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	3605 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	3606 break;
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3607 nargs++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3608 i++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3609 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	3610 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	3611 else
e51e17b2d88b fix bug with missing default for last arg (discovered by Tommy Burnette) Guido van Rossum <guido@python.org> parents: 2844 diff changeset	3612 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	3613 if (t == EQUAL) {
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3614 i++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3615 ndefs++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3616 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	3617 i++;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3618 if (i >= nch)
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3619 break;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3620 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	3621 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3622 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	3623 /* Treat "(a=1, b)" as an error */
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	3624 if (ndefs)
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	3625 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	3626 "non-default argument follows default argument");
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3627 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3628 if (t != COMMA)
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3629 break;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3630 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3631 return ndefs;
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3632 }
39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3633
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3634 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3635 com_funcdef(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3636 {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3637 PyObject *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	3638 int ndefs;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3639 REQ(n, funcdef); /* funcdef: 'def' NAME parameters ':' suite */
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3640 ndefs = com_argdefs(c, 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	3641 symtable_enter_scope(c->c_symtable, STR(CHILD(n, 1)), TYPE(n),
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	3642 n->n_lineno);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3643 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	3644 symtable_exit_scope(c->c_symtable);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3645 if (co == NULL)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3646 c->c_errors++;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3647 else {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3648 int closure = com_make_closure(c, (PyCodeObject *)co);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3649 int i = com_addconst(c, co);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3650 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	3651 com_push(c, 1);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3652 if (closure)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3653 com_addoparg(c, MAKE_CLOSURE, ndefs);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3654 else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3655 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	3656 com_pop(c, ndefs);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3657 com_addop_varname(c, VAR_STORE, STR(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	3658 com_pop(c, 1);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3659 Py_DECREF(co);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3660 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3661 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3662
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3663 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3664 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	3665 {
744 834dd4a77ee2 fix what lint found Guido van Rossum <guido@python.org> parents: 703 diff changeset	3666 int i;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3667 REQ(n, testlist);
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3668 /* testlist: test (',' test)* [','] */
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3669 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	3670 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	3671 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	3672 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	3673 com_pop(c, i-1);
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3674 }
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3675
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3676 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3677 com_classdef(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3678 {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3679 int i;
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	3680 PyObject *v;
149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	3681 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	3682 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	3683
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3684 REQ(n, classdef);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3685 /* 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	3686 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	3687 c->c_errors++;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3688 return;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3689 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3690 /* Push the class name on the stack */
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3691 i = com_addconst(c, v);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3692 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	3693 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	3694 Py_DECREF(v);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3695 /* 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	3696 if (TYPE(CHILD(n, 2)) != LPAR) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3697 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	3698 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	3699 }
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3700 else
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3701 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	3702 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	3703 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	3704 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	3705 symtable_exit_scope(c->c_symtable);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3706 if (co == NULL)
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3707 c->c_errors++;
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3708 else {
20491 149a65fa427c Fix computation of stack depth for classdef and closures. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20432 diff changeset	3709 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	3710 i = com_addconst(c, (PyObject *)co);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3711 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	3712 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	3713 if (closure) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3714 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	3715 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	3716 } else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3717 com_addoparg(c, MAKE_FUNCTION, 0);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3718 com_addoparg(c, CALL_FUNCTION, 0);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3719 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	3720 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	3721 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	3722 com_pop(c, 1);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3723 Py_DECREF(co);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3724 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3725 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3726
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3727 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3728 com_node(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3729 {
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3730 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	3731 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	3732 return;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3733 switch (TYPE(n)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3734
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3735 /* Definition nodes */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3736
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3737 case funcdef:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3738 com_funcdef(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3739 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3740 case classdef:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3741 com_classdef(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3742 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3743
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3744 /* Trivial parse tree nodes */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3745
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3746 case stmt:
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3747 case small_stmt:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3748 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	3749 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	3750 goto loop;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3751
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3752 case simple_stmt:
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3753 /* small_stmt (';' small_stmt)* [';'] NEWLINE */
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3754 com_set_lineno(c, n->n_lineno);
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3755 {
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3756 int i;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3757 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	3758 com_node(c, CHILD(n, i));
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3759 }
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3760 break;
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3761
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3762 case compound_stmt:
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3763 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	3764 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	3765 goto loop;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3766
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3767 /* Statement nodes */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3768
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3769 case expr_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3770 com_expr_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3771 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3772 case print_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3773 com_print_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3774 break;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3775 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	3776 com_assign(c, CHILD(n, 1), OP_DELETE, NULL);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3777 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3778 case pass_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3779 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3780 case break_stmt:
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3781 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	3782 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	3783 "'break' outside loop");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3784 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3785 com_addbyte(c, BREAK_LOOP);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3786 break;
317 325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3787 case continue_stmt:
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3788 com_continue_stmt(c, n);
325b40d77235 New syntax: semicolons, continue statement. Guido van Rossum <guido@python.org> parents: 303 diff changeset	3789 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3790 case return_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3791 com_return_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3792 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	3793 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	3794 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	3795 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3796 case raise_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3797 com_raise_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3798 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3799 case import_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3800 com_import_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3801 break;
466 90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3802 case global_stmt:
90cbcb0b97dc Implement 'global' and new class syntax. Guido van Rossum <guido@python.org> parents: 409 diff changeset	3803 break;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3804 case exec_stmt:
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3805 com_exec_stmt(c, n);
fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	3806 break;
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3807 case assert_stmt:
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3808 com_assert_stmt(c, n);
b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3809 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3810 case if_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3811 com_if_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3812 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3813 case while_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3814 com_while_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3815 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3816 case for_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3817 com_for_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3818 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3819 case try_stmt:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3820 com_try_stmt(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3821 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3822 case suite:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3823 com_suite(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3824 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3825
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3826 /* Expression nodes */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3827
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3828 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	3829 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	3830 case testlist_safe:
482 ee899a81570d New argument passing. Guido van Rossum <guido@python.org> parents: 466 diff changeset	3831 com_list(c, n, 0);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3832 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3833 case test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3834 com_test(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3835 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3836 case and_test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3837 com_and_test(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3838 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3839 case not_test:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3840 com_not_test(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3841 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3842 case comparison:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3843 com_comparison(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3844 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3845 case exprlist:
482 ee899a81570d New argument passing. Guido van Rossum <guido@python.org> parents: 466 diff changeset	3846 com_list(c, n, 0);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3847 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3848 case expr:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3849 com_expr(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3850 break;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3851 case xor_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3852 com_xor_expr(c, n);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3853 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3854 case and_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3855 com_and_expr(c, n);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3856 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3857 case shift_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3858 com_shift_expr(c, n);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3859 break;
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3860 case arith_expr:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3861 com_arith_expr(c, n);
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 388 diff changeset	3862 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3863 case term:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3864 com_term(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3865 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3866 case factor:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3867 com_factor(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3868 break;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3869 case power:
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3870 com_power(c, n);
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3871 break;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3872 case atom:
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3873 com_atom(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3874 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3875
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3876 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3877 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	3878 "com_node: unexpected node type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3879 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3880 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3881
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13330 diff changeset	3882 static void com_fplist(struct compiling , node );
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 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3885 com_fpdef(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3886 {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3887 REQ(n, fpdef); /* fpdef: NAME \| '(' fplist ')' */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3888 if (TYPE(CHILD(n, 0)) == LPAR)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3889 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	3890 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	3891 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	3892 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	3893 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3894 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3895
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3896 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3897 com_fplist(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3898 {
544 d0baa8300005 Minor changes. Guido van Rossum <guido@python.org> parents: 493 diff changeset	3899 REQ(n, fplist); /* fplist: fpdef (',' fpdef)* [','] */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3900 if (NCH(n) == 1) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3901 com_fpdef(c, CHILD(n, 0));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3902 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3903 else {
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3904 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	3905 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	3906 com_push(c, i-1);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3907 for (i = 0; i < NCH(n); i += 2)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3908 com_fpdef(c, CHILD(n, i));
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3909 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3910 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3911
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3912 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3913 com_arglist(struct compiling c, node n)
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	3914 {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3915 int nch, i, narg;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3916 int complex = 0;
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	3917 char nbuf[30];
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	3918 REQ(n, varargslist);
617 755bb8efcc2d Use strtoul() for oct/hex constants. Guido van Rossum <guido@python.org> parents: 584 diff changeset	3919 /* varargslist:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3920 (fpdef ['=' test] ',')* (fpdef ['=' test] \| '' .....) /
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3921 nch = NCH(n);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3922 /* Enter all arguments in table of locals */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3923 for (i = 0, narg = 0; i < nch; i++) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3924 node *ch = CHILD(n, i);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3925 node *fp;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3926 if (TYPE(ch) == STAR \|\| TYPE(ch) == 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	3927 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3928 REQ(ch, fpdef); /* fpdef: NAME \| '(' fplist ')' */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3929 fp = CHILD(ch, 0);
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	3930 if (TYPE(fp) != NAME) {
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	3931 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	3932 complex = 1;
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	3933 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3934 narg++;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3935 /* all name updates handled by symtable */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3936 if (++i >= nch)
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	3937 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3938 ch = CHILD(n, i);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3939 if (TYPE(ch) == EQUAL)
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	3940 i += 2;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3941 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3942 REQ(ch, COMMA);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3943 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3944 if (complex) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3945 /* Generate code for complex arguments only after
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3946 having counted the simple arguments */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3947 int ilocal = 0;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3948 for (i = 0; i < nch; i++) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3949 node *ch = CHILD(n, i);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3950 node *fp;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3166 diff changeset	3951 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	3952 break;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3953 REQ(ch, fpdef); /* fpdef: NAME \| '(' fplist ')' */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3954 fp = CHILD(ch, 0);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3955 if (TYPE(fp) != NAME) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3956 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	3957 com_push(c, 1);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3958 com_fpdef(c, ch);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3959 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3960 ilocal++;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3961 if (++i >= nch)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3962 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3963 ch = CHILD(n, i);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3964 if (TYPE(ch) == EQUAL)
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3965 i += 2;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3966 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3967 REQ(ch, COMMA);
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	3968 }
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	3969 }
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	3970 }
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	3971
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	3972 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3973 com_file_input(struct compiling c, node n)
69 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 int i;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3976 PyObject *doc;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3977 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	3978 doc = get_docstring(c, n);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3979 if (doc != NULL) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3980 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	3981 Py_DECREF(doc);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3982 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	3983 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	3984 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	3985 com_pop(c, 1);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	3986 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3987 for (i = 0; i < NCH(n); i++) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3988 node *ch = CHILD(n, i);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3989 if (TYPE(ch) != ENDMARKER && TYPE(ch) != NEWLINE)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3990 com_node(c, ch);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3991 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3992 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3993
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3994 /* Top-level compile-node interface */
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3995
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3996 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	3997 compile_funcdef(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3998 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3999 PyObject *doc;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4000 node *ch;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4001 REQ(n, funcdef); /* funcdef: 'def' NAME parameters ':' suite */
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	4002 c->c_name = STR(CHILD(n, 1));
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19252 diff changeset	4003 doc = get_docstring(c, CHILD(n, 4));
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4004 if (doc != NULL) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4005 (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	4006 Py_DECREF(doc);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4007 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4008 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4009 (void) com_addconst(c, Py_None); /* No docstring */
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4010 ch = CHILD(n, 2); /* parameters: '(' [varargslist] ')' */
37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4011 ch = CHILD(ch, 1); /* ')' \| varargslist */
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4012 if (TYPE(ch) == varargslist)
584 37aa67f0867c Added varargs code. Guido van Rossum <guido@python.org> parents: 568 diff changeset	4013 com_arglist(c, ch);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4014 c->c_infunction = 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4015 com_node(c, CHILD(n, 4));
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4016 c->c_infunction = 0;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	4017 com_addbyte(c, RETURN_NONE);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4018 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4019
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4020 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4021 compile_lambdef(struct compiling c, node n)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4022 {
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	4023 node *ch;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4024 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	4025 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	4026
06570429f062 * import.c (get_module): pass .py filename to parse_file, not .pyc filename! Guido van Rossum <guido@python.org> parents: 1405 diff changeset	4027 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	4028 (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	4029 if (TYPE(ch) == varargslist) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4030 com_arglist(c, ch);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4031 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	4032 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4033 else
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4034 ch = CHILD(n, 2);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4035 com_node(c, ch);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4036 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	4037 com_pop(c, 1);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4038 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4039
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1364 diff changeset	4040 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4041 compile_classdef(struct compiling c, node n)
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4042 {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4043 node *ch;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4044 PyObject *doc;
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4045 REQ(n, classdef);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4046 /* classdef: 'class' NAME ['(' testlist ')'] ':' suite */
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4047 c->c_name = STR(CHILD(n, 1));
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4048 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	4049 /* 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	4050 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	4051 com_addop_name(c, STORE_NAME, "__module__");
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4052 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	4053 doc = get_docstring(c, ch);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4054 if (doc != NULL) {
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4055 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	4056 Py_DECREF(doc);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4057 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	4058 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	4059 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	4060 com_pop(c, 1);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4061 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4062 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4063 (void) com_addconst(c, Py_None);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4064 com_node(c, ch);
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4065 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	4066 com_push(c, 1);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4067 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	4068 com_pop(c, 1);
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4069 }
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4070
53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4071 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4072 compile_node(struct compiling c, node n)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4073 {
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	4074 com_set_lineno(c, n->n_lineno);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4075
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4076 switch (TYPE(n)) {
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4077
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4078 case single_input: /* One interactive command */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4079 /* 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	4080 c->c_interactive++;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4081 n = CHILD(n, 0);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4082 if (TYPE(n) != NEWLINE)
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4083 com_node(c, n);
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	4084 com_addbyte(c, RETURN_NONE);
1833 39a4c15acb32 * Python/compile.c (com_argdefs, com_arglist): avoid referencing Guido van Rossum <guido@python.org> parents: 1417 diff changeset	4085 c->c_interactive--;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4086 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4087
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4088 case file_input: /* A whole file, or built-in function exec() */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4089 com_file_input(c, n);
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	4090 com_addbyte(c, RETURN_NONE);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4091 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4092
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	4093 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	4094 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	4095 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	4096 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	4097 break;
c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4098
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	4099 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	4100 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	4101 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	4102
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4103 case funcdef: /* A function definition */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4104 compile_funcdef(c, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4105 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4106
120 c9a5fe1660f5 Fix bug in input(); add comments to cases in compile(). Guido van Rossum <guido@python.org> parents: 86 diff changeset	4107 case classdef: /* A class definition */
2089 53aa51433f7f Two independent chages: Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4108 compile_classdef(c, n);
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4109 break;
3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4110
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4111 default:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4112 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	4113 "compile_node: unexpected node type");
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4114 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4115 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4116
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4117 static PyObject *
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4118 dict_keys_inorder(PyObject *dict, int offset)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4119 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4120 PyObject tuple, k, *v;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4121 int i, pos = 0, size = PyDict_Size(dict);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4122
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4123 tuple = PyTuple_New(size);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4124 if (tuple == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4125 return NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4126 while (PyDict_Next(dict, &pos, &k, &v)) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4127 i = PyInt_AS_LONG(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4128 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	4129 assert((i - offset) < size);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4130 PyTuple_SET_ITEM(tuple, i - offset, k);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4131 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4132 return tuple;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4133 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4134
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4135 PyCodeObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4136 PyNode_Compile(node n, char filename)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4137 {
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4138 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	4139 }
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4140
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4141 PyCodeObject *
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4142 PyNode_CompileFlags(node n, char filename, PyCompilerFlags *flags)
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4143 {
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4144 return jcompile(n, filename, NULL, flags);
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4145 }
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4146
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4147 struct symtable *
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4148 PyNode_CompileSymtable(node n, char filename)
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4149 {
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4150 struct symtable *st;
17112 76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4151 PyFutureFeatures *ff;
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4152
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4153 ff = PyNode_Future(n, filename);
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4154 if (ff == NULL)
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4155 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	4156
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4157 st = symtable_init();
20867 40a88989d6cb Part of SF bug #478003 possible memory leaks in err handling. Tim Peters <tim.peters@gmail.com> parents: 20517 diff changeset	4158 if (st == NULL) {
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	4159 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	4160 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	4161 }
17112 76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4162 st->st_future = 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	4163 symtable_enter_scope(st, TOP, TYPE(n), n->n_lineno);
17112 76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4164 if (st->st_errors > 0)
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4165 goto 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	4166 symtable_node(st, n);
17112 76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4167 if (st->st_errors > 0)
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4168 goto fail;
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4169
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4170 return st;
17112 76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4171 fail:
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	4172 PyObject_FREE((void *)ff);
17112 76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4173 st->st_future = NULL;
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4174 PySymtable_Free(st);
76eab2ebce58 Update PyNode_CompileSymtable() to understand future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17104 diff changeset	4175 return 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	4176 }
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4177
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4178 static PyCodeObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4179 icompile(node n, struct compiling base)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4180 {
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4181 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	4182 }
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4183
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4184 static PyCodeObject *
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4185 jcompile(node n, char filename, struct compiling *base,
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4186 PyCompilerFlags *flags)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4187 {
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4188 struct compiling sc;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4189 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	4190 if (!com_init(&sc, filename))
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4191 return NULL;
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4192 if (TYPE(n) == encoding_decl) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4193 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	4194 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	4195 } else {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24529 diff changeset	4196 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	4197 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4198 if (base) {
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4199 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	4200 sc.c_symtable = base->c_symtable;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4201 /* c_symtable still points to parent's symbols */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4202 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	4203 \|\| (sc.c_symtable->st_cur->ste_type == TYPE_FUNCTION))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4204 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	4205 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	4206 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	4207 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	4208 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	4209 }
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 } else {
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4211 sc.c_private = NULL;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: 16783 diff changeset	4212 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	4213 if (sc.c_future == NULL) {
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4214 com_free(&sc);
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4215 return NULL;
b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4216 }
19252 fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4217 if (flags) {
fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4218 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	4219 flags->cf_flags;
fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4220 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	4221 flags->cf_flags = merged;
fbf1ae769306 Fix SF bug [ #450909 ] __future__.division fails at prompt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19187 diff changeset	4222 }
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	4223 if (symtable_build(&sc, 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	4224 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	4225 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	4226 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4227 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4228 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	4229 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	4230 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	4231 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	4232 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4233 compile_node(&sc, n);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4234 com_done(&sc);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1029 diff changeset	4235 if (sc.c_errors == 0) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4236 PyObject consts, names, varnames, filename, *name,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4237 freevars, cellvars;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4238 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	4239 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	4240 varnames = PyList_AsTuple(sc.c_varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4241 cellvars = dict_keys_inorder(sc.c_cellvars, 0);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4242 freevars = dict_keys_inorder(sc.c_freevars,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4243 PyTuple_GET_SIZE(cellvars));
5009 402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	4244 filename = PyString_InternFromString(sc.c_filename);
402e36c83d20 Intern all names and varnames in newcodeobject(), plus those string Guido van Rossum <guido@python.org> parents: 4991 diff changeset	4245 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	4246 if (!PyErr_Occurred())
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4247 co = PyCode_New(sc.c_argcount,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4248 sc.c_nlocals,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4249 sc.c_maxstacklevel,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4250 sc.c_flags,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4251 sc.c_code,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4252 consts,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4253 names,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4254 varnames,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4255 freevars,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4256 cellvars,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4257 filename,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4258 name,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4259 sc.c_firstlineno,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4260 sc.c_lnotab);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4261 Py_XDECREF(consts);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4262 Py_XDECREF(names);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4263 Py_XDECREF(varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4264 Py_XDECREF(freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4265 Py_XDECREF(cellvars);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4266 Py_XDECREF(filename);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4267 Py_XDECREF(name);
266 b5826bf29677 Changed and exported newcodeobject() interface, for ".pyc" files. Guido van Rossum <guido@python.org> parents: 238 diff changeset	4268 }
13884 8eeaff96b4c2 When returning an error from jcompile() (which is passed through by Guido van Rossum <guido@python.org> parents: 13873 diff changeset	4269 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	4270 /* 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	4271 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	4272 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	4273 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	4274 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	4275 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	4276 }
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 exit:
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	4278 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	4279 PySymtable_Free(sc.c_symtable);
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	4280 sc.c_symtable = NULL;
51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	4281 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4282 com_free(&sc);
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4283 return co;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4284 }
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4285
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4286 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13585 diff changeset	4287 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	4288 {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4289 int size = PyString_Size(co->co_lnotab) / 2;
11290 ccdf5dc2acf6 Tim Peters writes: Guido van Rossum <guido@python.org> parents: 9987 diff changeset	4290 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	4291 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	4292 int addr = 0;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4293 while (--size >= 0) {
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4294 addr += *p++;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4295 if (addr > addrq)
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4296 break;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4297 line += *p++;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4298 }
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4299 return line;
c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4300 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4301
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4302 /* 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	4303 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	4304 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	4305 */
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4306
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4307 static int
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4308 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	4309 {
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4310 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	4311 PyObject *v;
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4312
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4313 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	4314 return CELL;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4315 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	4316 return LOCAL;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4317 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	4318 return FREE;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4319 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	4320 if (v) {
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4321 if (v == Py_None)
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4322 return GLOBAL_EXPLICIT;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4323 else {
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4324 return GLOBAL_IMPLICIT;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4325 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4326 }
21066 225c7dd17e37 Fixes for possible buffer overflows in sprintf() usages. Marc-André Lemburg <mal@egenix.com> parents: 20947 diff changeset	4327 PyOS_snprintf(buf, sizeof(buf),
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4328 "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	4329 "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	4330 name, c->c_name,
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4331 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	4332 c->c_filename,
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4333 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	4334 PyObject_REPR(c->c_locals),
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4335 PyObject_REPR(c->c_globals)
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4336 );
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4337
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4338 Py_FatalError(buf);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4339 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	4340 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4341
16933 b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4342 /* Helper functions to issue warnings */
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4343
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4344 static int
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4345 issue_warning(char msg, char filename, int lineno)
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4346 {
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4347 if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, filename,
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4348 lineno, NULL, NULL) < 0) {
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4349 if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4350 PyErr_SetString(PyExc_SyntaxError, msg);
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4351 PyErr_SyntaxLocation(filename, lineno);
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4352 }
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4353 return -1;
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4354 }
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4355 return 0;
b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4356 }
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	4357
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4358 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	4359 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	4360 {
16933 b046a31af2e0 Refactored the warning-issuing code more. Guido van Rossum <guido@python.org> parents: 16916 diff changeset	4361 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	4362 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	4363 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	4364 }
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4365 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	4366 }
ec9083ac26df Let's have some sanity. Introduce a helper to issue a symbol table Guido van Rossum <guido@python.org> parents: 16853 diff changeset	4367
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16823 diff changeset	4368 /* 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	4369
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4370 static int
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4371 symtable_build(struct compiling c, 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	4372 {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4373 if ((c->c_symtable = symtable_init()) == 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	4374 return -1;
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	4375 c->c_symtable->st_future = c->c_future;
16428 6496844c4a42 Fix symbol table pass to generation SyntaxError exceptions that Jeremy Hylton <jeremy@alum.mit.edu> parents: 16421 diff changeset	4376 c->c_symtable->st_filename = c->c_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	4377 symtable_enter_scope(c->c_symtable, TOP, TYPE(n), n->n_lineno);
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4378 if (c->c_symtable->st_errors > 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	4379 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	4380 symtable_node(c->c_symtable, n);
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	4381 if (c->c_symtable->st_errors > 0)
9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	4382 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	4383 /* reset for second pass */
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4384 c->c_symtable->st_nscopes = 1;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4385 c->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	4386 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	4387 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4388
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4389 static int
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4390 symtable_init_compiling_symbols(struct compiling *c)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4391 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4392 PyObject *varnames;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4393
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4394 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	4395 if (varnames == NULL) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4396 varnames = PyList_New(0);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4397 if (varnames == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4398 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4399 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	4400 Py_INCREF(varnames);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4401 } else
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4402 Py_INCREF(varnames);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4403 c->c_varnames = varnames;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4404
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4405 c->c_globals = PyDict_New();
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4406 if (c->c_globals == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4407 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4408 c->c_freevars = PyDict_New();
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4409 if (c->c_freevars == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4410 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4411 c->c_cellvars = PyDict_New();
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4412 if (c->c_cellvars == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4413 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4414 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4415 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4416
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4417 struct symbol_info {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4418 int si_nlocals;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4419 int si_ncells;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4420 int si_nfrees;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4421 int si_nimplicit;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4422 };
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4423
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4424 static void
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4425 symtable_init_info(struct symbol_info *si)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4426 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4427 si->si_nlocals = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4428 si->si_ncells = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4429 si->si_nfrees = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4430 si->si_nimplicit = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4431 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4432
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4433 static int
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	4434 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	4435 struct symbol_info *si)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4436 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4437 PyObject dict, v;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4438
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4439 /* 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	4440 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	4441 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	4442 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	4443 */
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4444 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	4445 /* 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	4446 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	4447 return 0;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4448 v = PyInt_FromLong(si->si_ncells++);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4449 dict = c->c_cellvars;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4450 } else {
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	4451 /* 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	4452 anything here.
8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	4453 */
8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	4454 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	4455 \|\| (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	4456 return 0;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4457 v = PyInt_FromLong(si->si_nfrees++);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4458 dict = c->c_freevars;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4459 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4460 if (v == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4461 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4462 if (PyDict_SetItem(dict, name, v) < 0) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4463 Py_DECREF(v);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4464 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4465 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4466 Py_DECREF(v);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4467 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4468 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4469
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4470 /* 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	4471 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	4472 */
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4473
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4474
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4475 static int
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4476 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	4477 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	4478 {
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4479 PyObject v, w, d, list = NULL;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4480 int i, pos;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4481
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4482 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	4483 argcount++;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4484 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	4485 argcount++;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4486 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	4487 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	4488 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	4489 if (list == NULL) {
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4490 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	4491 if (list == NULL)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4492 return -1;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4493 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	4494 Py_INCREF(v);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4495 } else
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4496 PyList_Insert(list, 0, v);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4497 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4498 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4499 if (list == NULL \|\| PyList_GET_SIZE(list) == 0)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4500 return 0;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4501 /* 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	4502 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	4503 */
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4504 d = PyDict_New();
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4505 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	4506 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	4507 if (v == NULL)
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4508 goto fail;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4509 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	4510 goto fail;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4511 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	4512 goto fail;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4513 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4514 pos = 0;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4515 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	4516 Py_DECREF(list);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4517 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	4518 w = PyInt_FromLong(i++); /* don't care about the old key */
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4519 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	4520 Py_DECREF(w);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4521 goto fail;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4522 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4523 Py_DECREF(w);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4524 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4525 Py_DECREF(*cellvars);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4526 *cellvars = d;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4527 return 1;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4528 fail:
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4529 Py_DECREF(d);
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4530 return -1;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4531 }
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4532
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4533 static int
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4534 symtable_freevar_offsets(PyObject *freevars, int offset)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4535 {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4536 PyObject name, v;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4537 int pos;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4538
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4539 /* 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	4540 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	4541 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	4542 pos = 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4543 while (PyDict_Next(freevars, &pos, &name, &v)) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4544 int i = PyInt_AS_LONG(v) + offset;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4545 PyObject *o = PyInt_FromLong(i);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4546 if (o == NULL)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4547 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4548 if (PyDict_SetItem(freevars, name, o) < 0) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4549 Py_DECREF(o);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4550 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4551 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4552 Py_DECREF(o);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4553 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4554 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4555 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4556
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4557 static int
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4558 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	4559 PySymtableEntryObject *ste,
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4560 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	4561 {
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4562 char buf[300];
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4563
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4564 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	4565 \|\| (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	4566 return 0;
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4567
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4568 #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	4569
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4570 #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	4571
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4572 #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	4573 "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	4574
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4575 #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	4576 "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	4577
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4578 #define ILLEGAL_EXEC_AND_IMPORT_STAR \
21834 c1d55a627897 Fix missing space between words. Bugfix candidate. Neal Norwitz <nnorwitz@gmail.com> parents: 21833 diff changeset	4579 "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	4580 "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	4581
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4582 /* 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	4583 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	4584
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4585 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	4586 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	4587 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4588 ILLEGAL_IMPORT_STAR,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4589 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4590 ILLEGAL_CONTAINS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4591 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	4592 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4593 ILLEGAL_BARE_EXEC,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4594 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4595 ILLEGAL_CONTAINS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4596 else {
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4597 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4598 ILLEGAL_EXEC_AND_IMPORT_STAR,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4599 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4600 ILLEGAL_CONTAINS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4601 }
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4602 } else {
1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4603 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	4604 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4605 ILLEGAL_IMPORT_STAR,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4606 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4607 ILLEGAL_IS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4608 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	4609 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4610 ILLEGAL_BARE_EXEC,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4611 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4612 ILLEGAL_IS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4613 else {
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4614 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4615 ILLEGAL_EXEC_AND_IMPORT_STAR,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4616 PyString_AS_STRING(ste->ste_name),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	4617 ILLEGAL_IS);
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4618 }
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4619 }
17131 1c90a1cf795c Make error messages clearer for illegal combinations of nested Jeremy Hylton <jeremy@alum.mit.edu> parents: 17124 diff changeset	4620
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4621 PyErr_SetString(PyExc_SyntaxError, buf);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4622 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	4623 ste->ste_opt_lineno);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4624 return -1;
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4625 }
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4626
77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4627 static int
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4628 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	4629 struct symbol_info *si)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4630 {
19158 97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19051 diff changeset	4631 if (c->c_future)
97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19051 diff changeset	4632 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	4633 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	4634 c->c_flags \|= CO_GENERATOR;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4635 if (ste->ste_type != TYPE_MODULE)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4636 c->c_flags \|= CO_NEWLOCALS;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4637 if (ste->ste_type == TYPE_FUNCTION) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4638 c->c_nlocals = si->si_nlocals;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4639 if (ste->ste_optimized == 0)
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4640 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	4641 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	4642 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	4643 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4644 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4645 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4646
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4647 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	4648 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	4649 {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4650 static PyObject *implicit = NULL;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4651 struct symtable *st = c->c_symtable;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4652 PySymtableEntryObject *ste = st->st_cur;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4653 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	4654 int i, flags, pos;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4655 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	4656
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4657 if (implicit == NULL) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4658 implicit = PyInt_FromLong(1);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4659 if (implicit == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4660 return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4661 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4662 v = NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4663
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4664 if (symtable_init_compiling_symbols(c) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4665 goto fail;
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4666 symtable_init_info(&si);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4667 varnames = st->st_cur->ste_varnames;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4668 si.si_nlocals = PyList_GET_SIZE(varnames);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4669 c->c_argcount = si.si_nlocals;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4670
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4671 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	4672 v = PyInt_FromLong(i);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4673 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	4674 PyList_GET_ITEM(varnames, i), v) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4675 goto fail;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4676 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	4677 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4678
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4679 /* 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	4680 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	4681 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	4682 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	4683 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	4684
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4685 if (flags & DEF_FREE_GLOBAL)
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4686 /* undo the original DEF_FREE */
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4687 flags &= ~(DEF_FREE \| DEF_FREE_CLASS);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4688
17078 7e181eba6b9b Fixup handling of free variables in methods when the class scope also Jeremy Hylton <jeremy@alum.mit.edu> parents: 17076 diff changeset	4689 /* 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	4690 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	4691 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	4692 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	4693 */
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4694 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	4695 symtable_resolve_free(c, name, flags, &si);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4696
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4697 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	4698 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	4699 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	4700 } 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	4701 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	4702 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	4703 } 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	4704 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	4705 else if (flags & DEF_GLOBAL) {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4706 if (flags & DEF_PARAM) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4707 PyErr_Format(PyExc_SyntaxError, LOCAL_GLOBAL,
16428 6496844c4a42 Fix symbol table pass to generation SyntaxError exceptions that Jeremy Hylton <jeremy@alum.mit.edu> parents: 16421 diff changeset	4708 PyString_AS_STRING(name));
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16831 diff changeset	4709 PyErr_SyntaxLocation(st->st_filename,
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4710 ste->ste_lineno);
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4711 st->st_errors++;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4712 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	4713 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4714 if (PyDict_SetItem(c->c_globals, name, Py_None) < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4715 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	4716 } else if (flags & DEF_FREE_GLOBAL) {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4717 si.si_nimplicit++;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4718 if (PyDict_SetItem(c->c_globals, name, implicit) < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4719 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	4720 } 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	4721 v = PyInt_FromLong(si.si_nlocals++);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4722 if (v == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4723 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	4724 if (PyDict_SetItem(c->c_locals, name, v) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4725 goto fail;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4726 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	4727 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	4728 if (PyList_Append(c->c_varnames, name) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4729 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	4730 } else if (is_free(flags)) {
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4731 if (ste->ste_nested) {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4732 v = PyInt_FromLong(si.si_nfrees++);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4733 if (v == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4734 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	4735 if (PyDict_SetItem(c->c_freevars, name, v) < 0)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4736 goto fail;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4737 Py_DECREF(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4738 } else {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4739 si.si_nimplicit++;
19177 50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4740 if (PyDict_SetItem(c->c_globals, name,
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4741 implicit) < 0)
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4742 goto fail;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4743 if (st->st_nscopes != 1) {
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4744 v = PyInt_FromLong(flags);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4745 if (PyDict_SetItem(st->st_global,
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4746 name, v))
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4747 goto fail;
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4748 Py_DECREF(v);
50f88ee71d45 Remove st_nested_scopes from struct symtable, Jeremy Hylton <jeremy@alum.mit.edu> parents: 19160 diff changeset	4749 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 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 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4752 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4753
17637 8ff76cf30a8c Fix 2.1 nested scopes crash reported by Evan Simpson Jeremy Hylton <jeremy@alum.mit.edu> parents: 17597 diff changeset	4754 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	4755
17104 a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4756 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	4757 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	4758 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	4759 return -1;
a488a63cb867 Fix PyFrame_FastToLocals() and counterpart to deal with cells and Jeremy Hylton <jeremy@alum.mit.edu> parents: 17078 diff changeset	4760 }
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4761 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	4762 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4763 return symtable_update_flags(c, ste, &si);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4764 fail:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4765 /* is this always the right thing to do? */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4766 Py_XDECREF(v);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4767 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	4768 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4769
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4770 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	4771 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	4772 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4773 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	4774
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	4775 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	4776 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	4777 return NULL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4778 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	4779
16428 6496844c4a42 Fix symbol table pass to generation SyntaxError exceptions that Jeremy Hylton <jeremy@alum.mit.edu> parents: 16421 diff changeset	4780 st->st_filename = NULL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4781 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	4782 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	4783 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	4784 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	4785 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	4786 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	4787 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	4788 st->st_tmpname = 0;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4789 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	4790 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	4791 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	4792 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	4793 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	4794 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4795
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4796 void
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4797 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	4798 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4799 Py_XDECREF(st->st_symbols);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4800 Py_XDECREF(st->st_stack);
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	4801 Py_XDECREF(st->st_cur);
24529 3444005b6527 SF patch #578297: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 24373 diff changeset	4802 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	4803 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4804
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4805 /* 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	4806 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	4807 children.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4808
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4809 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	4810 scope are cellvars.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4811
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4812 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	4813 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	4814 implicit globals.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4815
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4816 */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4817
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4818 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4819 symtable_update_free_vars(struct symtable *st)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4820 {
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4821 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	4822 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	4823 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	4824
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4825 if (ste->ste_type == TYPE_CLASS)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4826 def = DEF_FREE_CLASS;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4827 else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4828 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	4829 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	4830 int pos = 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4831
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4832 if (list)
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4833 PyList_SetSlice(list, 0,
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4834 ((PyVarObject*)list)->ob_size, 0);
16754 23c7a0108f59 symtable_update_free_vars(), symtable_undo_free(), Barry Warsaw <barry@python.org> parents: 16753 diff changeset	4835 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	4836 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	4837 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	4838 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	4839 if (!(is_free(flags)))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4840 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	4841 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	4842 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	4843 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	4844 return -1;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4845 }
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4846 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	4847 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	4848 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	4849 return -1;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4850 }
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4851 }
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4852 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	4853 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	4854 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	4855 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	4856 /* 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	4857 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	4858 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	4859 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	4860 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	4861 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	4862 nested scopes.
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	4863 */
17078 7e181eba6b9b Fixup handling of free variables in methods when the class scope also Jeremy Hylton <jeremy@alum.mit.edu> parents: 17076 diff changeset	4864 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	4865 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	4866 if (flags & DEF_GLOBAL) {
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	4867 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	4868 name);
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	4869 continue;
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	4870 }
f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	4871 }
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4872 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	4873 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	4874 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	4875 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	4876 return -1;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4877 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4878 } 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	4879 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	4880 name) < 0) {
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4881 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	4882 return -1;
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4883 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4884 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4885 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4886 }
16571 2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4887
2c6417ef4628 In symtable_update_free_vars() do not modify the dictionary while Jeremy Hylton <jeremy@alum.mit.edu> parents: 16540 diff changeset	4888 Py_XDECREF(list);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4889 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4890 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4891
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4892 /* 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	4893 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	4894 global in all nested scopes.
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4895 */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4896
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4897 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4898 symtable_check_global(struct symtable st, PyObject child, PyObject *name)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4899 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4900 PyObject *o;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4901 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	4902 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	4903
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4904 if (ste->ste_type == TYPE_CLASS)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4905 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	4906 o = PyDict_GetItem(ste->ste_symbols, name);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4907 if (o == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4908 return symtable_undo_free(st, child, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4909 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	4910
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	4911 if (is_free(v) \|\| (v & DEF_GLOBAL))
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4912 return symtable_undo_free(st, child, name);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4913 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	4914 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	4915 name, DEF_FREE);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4916 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4917
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4918 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4919 symtable_undo_free(struct symtable st, PyObject id,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4920 PyObject *name)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4921 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4922 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	4923 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	4924 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	4925
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4926 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	4927 if (ste == NULL)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4928 return -1;
16892 f27d3299df39 Fix core dump in example from Samuele Pedroni: Jeremy Hylton <jeremy@alum.mit.edu> parents: 16878 diff changeset	4929
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4930 info = PyDict_GetItem(ste->ste_symbols, name);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4931 if (info == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4932 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4933 v = PyInt_AS_LONG(info);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4934 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	4935 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	4936 DEF_FREE_GLOBAL) < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4937 return -1;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4938 } else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4939 /* If the name is defined here or declared global,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4940 then the recursion stops. */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4941 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4942
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4943 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	4944 PySymtableEntryObject *child;
16754 23c7a0108f59 symtable_update_free_vars(), symtable_undo_free(), Barry Warsaw <barry@python.org> parents: 16753 diff changeset	4945 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	4946 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	4947 x = symtable_undo_free(st, child->ste_id, name);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4948 if (x < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4949 return x;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4950 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4951 return 0;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4952 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4953
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4954 /* 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	4955 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	4956 in symtable_exit_scope().
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4957 */
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4958
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4959 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4960 symtable_exit_scope(struct symtable *st)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4961 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4962 int end;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4963
16862 77a5470299db Add warning/error handlin for problematic nested scopes cases as Jeremy Hylton <jeremy@alum.mit.edu> parents: 16855 diff changeset	4964 if (st->st_pass == 1)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4965 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	4966 Py_DECREF(st->st_cur);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4967 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	4968 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	4969 end);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4970 if (PySequence_DelItem(st->st_stack, end) < 0)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4971 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	4972 return 0;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4973 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4974
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4975 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	4976 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	4977 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	4978 {
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4979 PySymtableEntryObject *prev = NULL;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4980
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4981 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	4982 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	4983 if (PyList_Append(st->st_stack, (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	4984 Py_DECREF(st->st_cur);
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4985 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	4986 return;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4987 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4988 }
16754 23c7a0108f59 symtable_update_free_vars(), symtable_undo_free(), Barry Warsaw <barry@python.org> parents: 16753 diff changeset	4989 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	4990 PySymtableEntry_New(st, name, type, lineno);
a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	4991 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	4992 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	4993 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	4994 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	4995 (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	4996 st->st_errors++;
16753 51977af230fa Fix for bug 133489: compiler leaks memory Jeremy Hylton <jeremy@alum.mit.edu> parents: 16699 diff changeset	4997 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4998 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4999
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5000 static int
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5001 symtable_lookup(struct symtable st, char name)
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 char buffer[MANGLE_LEN];
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5004 PyObject *v;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5005 int flags;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5006
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	5007 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	5008 name = buffer;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5009 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	5010 if (v == NULL) {
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5011 if (PyErr_Occurred())
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5012 return -1;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5013 else
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5014 return 0;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5015 }
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 flags = PyInt_AS_LONG(v);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5018 return flags;
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5019 }
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5020
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5021 static int
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5022 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	5023 {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5024 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	5025 char buffer[MANGLE_LEN];
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5026 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	5027
24858 592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5028 /* 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	5029 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	5030 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	5031 *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	5032 {
592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5033 if (symtable_warn(st, "argument named None"))
592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5034 return -1;
592406e0c9b0 Add warnings for arguments named None. All set. (I could add a Guido van Rossum <guido@python.org> parents: 24856 diff changeset	5035 }
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23868 diff changeset	5036 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	5037 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	5038 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	5039 return -1;
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5040 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	5041 Py_DECREF(s);
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5042 return ret;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5043 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5044
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5045 /* Must only be called with mangled names */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5046
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5047 static int
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5048 symtable_add_def_o(struct symtable st, PyObject dict,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5049 PyObject *name, int flag)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5050 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5051 PyObject *o;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5052 int val;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5053
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5054 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	5055 val = PyInt_AS_LONG(o);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5056 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	5057 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	5058 PyString_AsString(name));
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16831 diff changeset	5059 PyErr_SyntaxLocation(st->st_filename,
16539 a47d93ef103a Relax the rules for using 'from ... import ' and exec in the presence Jeremy Hylton <jeremy@alum.mit.edu>* parents: 16523 diff changeset	5060 st->st_cur->ste_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	5061 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	5062 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5063 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	5064 } else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5065 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	5066 o = PyInt_FromLong(val);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5067 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	5068 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	5069 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	5070 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5071 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	5072
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5073 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	5074 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	5075 return -1;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5076 } else if (flag & DEF_GLOBAL) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5077 /* XXX need to update DEF_GLOBAL for other flags too;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5078 perhaps only DEF_FREE_GLOBAL */
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5079 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	5080 val = PyInt_AS_LONG(o);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5081 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	5082 } else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5083 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	5084 o = PyInt_FromLong(val);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5085 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	5086 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	5087 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	5088 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5089 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	5090 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5091 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	5092 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5093
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5094 #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	5095
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	5096 /* 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	5097 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	5098 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	5099 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	5100 static int
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5101 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	5102 {
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5103 int i;
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5104
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5105 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	5106 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	5107
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5108 switch (TYPE(kid)) {
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5109
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5110 case classdef:
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5111 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	5112 case lambdef:
18274 86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5113 /* 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	5114 the parent a generator. */
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5115 return 0;
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5116
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5117 case yield_stmt:
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5118 return 1;
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5119
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5120 default:
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5121 if (look_for_yield(kid))
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5122 return 1;
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5123 }
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5124 }
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5125 return 0;
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5126 }
86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5127
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5128 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	5129 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	5130 {
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5131 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	5132
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5133 loop:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5134 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	5135 case funcdef: {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5136 char *func_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	5137 symtable_add_def(st, func_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	5138 symtable_default_args(st, CHILD(n, 2));
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5139 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	5140 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	5141 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	5142 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5143 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5144 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	5145 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	5146 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	5147 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	5148 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	5149 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	5150 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5151 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	5152 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	5153 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	5154 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	5155 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	5156 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	5157 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	5158 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	5159 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5160 }
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	5161 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	5162 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	5163 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	5164 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	5165 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	5166 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	5167 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5168 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5169 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	5170 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	5171 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	5172 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	5173 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	5174 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	5175 continue;
18274 86dab0d43b73 SF bug #436207: "if 0: yield x" is ignored. Tim Peters <tim.peters@gmail.com> parents: 18243 diff changeset	5176 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5177 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	5178 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	5179 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5180 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	5181 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	5182 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5183 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	5184 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	5185 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5186 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	5187 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	5188 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	5189 case exec_stmt: {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5190 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	5191 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	5192 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	5193 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	5194 else {
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5195 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	5196 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	5197 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5198 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	5199 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	5200 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	5201
f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16357 diff changeset	5202 }
16680 17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5203 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	5204 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	5205 return;
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5206 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	5207 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	5208 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	5209 } else {
17ed61fd5b65 When running python -O, do not include blocks defined in asserts in Jeremy Hylton <jeremy@alum.mit.edu> parents: 16677 diff changeset	5210 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	5211 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	5212 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	5213 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5214 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	5215 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	5216 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	5217 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	5218 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	5219 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	5220 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5221 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5222 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	5223 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	5224 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	5225 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	5226 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	5227 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	5228 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	5229 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	5230 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	5231 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	5232 else {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5233 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	5234 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	5235 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	5236 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5237 } else {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5238 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	5239 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	5240 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	5241 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	5242 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5243 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5244 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	5245 case list_iter:
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5246 n = CHILD(n, 0);
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5247 if (TYPE(n) == list_for) {
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5248 st->st_tmpname++;
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5249 symtable_list_comprehension(st, n);
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5250 st->st_tmpname--;
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5251 } else {
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5252 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	5253 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	5254 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	5255 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	5256 goto loop;
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5257 }
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5258 }
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5259 break;
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5260 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	5261 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	5262 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	5263 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	5264 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	5265 break;
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5266 /* 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	5267 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	5268 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	5269 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	5270 */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5271 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	5272 if (TYPE(n) == argument && NCH(n) == 3) {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5273 n = CHILD(n, 2);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5274 goto loop;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5275 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5276 /* 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	5277 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	5278 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == list_for) {
17076 85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	5279 st->st_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	5280 symtable_list_comprehension(st, CHILD(n, 1));
17076 85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	5281 symtable_node(st, CHILD(n, 0));
85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	5282 st->st_tmpname--;
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5283 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	5284 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5285 /* 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	5286 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	5287 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	5288 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	5289 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5290 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5291 /* 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	5292 default:
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5293 /* 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	5294 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	5295 */
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5296 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	5297 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	5298 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	5299 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5300 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	5301 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	5302 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	5303 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5304 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5305
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5306 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	5307 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	5308 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5309 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	5310
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5311 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	5312 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	5313 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	5314 } else
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5315 symtable_params(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	5316 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	5317 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	5318 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5319
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5320 /* 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	5321 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	5322 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	5323 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	5324 body.
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5325
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5326 varargslist:
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5327 (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	5328 \| 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	5329 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5330
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5331 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	5332 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	5333 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5334 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	5335 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	5336
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5337 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	5338 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	5339 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	5340 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5341 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5342 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	5343 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	5344 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	5345 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	5346 break;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5347 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5348 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	5349 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	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 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5352
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5353 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	5354 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	5355 {
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	5356 int i, complex = -1, ext = 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	5357 node *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	5358
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5359 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	5360 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	5361 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	5362 return;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5363 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5364 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	5365 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	5366 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	5367 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	5368 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	5369 break;
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 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	5372 continue;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5373 }
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 (TYPE(CHILD(c, 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	5375 symtable_add_def(st, STR(CHILD(c, 0)), DEF_PARAM);
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5376 else {
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5377 char nbuf[30];
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5378 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	5379 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	5380 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	5381 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5382 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5383 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	5384 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	5385 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	5386 i++;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5387 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	5388 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	5389 i += 2;
16137 883cb0e31bb2 prevent symtable_params() from dereferencing off the end of the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16096 diff changeset	5390 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	5391 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	5392 else
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5393 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	5394 }
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	5395 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	5396 i++;
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5397 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	5398 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	5399 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5400 }
16250 aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	5401 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	5402 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	5403 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	5404 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	5405 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	5406 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	5407 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	5408 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	5409 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	5410 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	5411 }
aab871635ffa Fix bug reported by Ka-Ping Yee: The compiler botched parsing function Jeremy Hylton <jeremy@alum.mit.edu> parents: 16138 diff changeset	5412 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5413 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5414
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5415 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	5416 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	5417 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5418 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	5419 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	5420
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5421 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	5422 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	5423 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	5424 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	5425 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	5426 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	5427 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	5428 else
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5429 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	5430 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5431
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5432 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5433
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5434 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	5435 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	5436 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5437 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	5438
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16892 diff changeset	5439 /* 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	5440 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	5441 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	5442 */
16871 d675d75af839 Warn about global statement at the module level. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16862 diff changeset	5443
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5444 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	5445 char *name = STR(CHILD(n, i));
16783 4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5446 int flags;
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5447
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5448 flags = symtable_lookup(st, name);
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5449 if (flags < 0)
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5450 continue;
16783 4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5451 if (flags && flags != DEF_GLOBAL) {
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5452 char buf[500];
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5453 if (flags & DEF_PARAM) {
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5454 PyErr_Format(PyExc_SyntaxError,
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5455 "name '%.400s' is local and global",
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5456 name);
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16831 diff changeset	5457 PyErr_SyntaxLocation(st->st_filename,
16783 4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5458 st->st_cur->ste_lineno);
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5459 st->st_errors++;
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5460 return;
16853 05785bdf289c Use the new PyErr_WarnExplicit() API to issue better warnings for Guido van Rossum <guido@python.org> parents: 16838 diff changeset	5461 }
05785bdf289c Use the new PyErr_WarnExplicit() API to issue better warnings for Guido van Rossum <guido@python.org> parents: 16838 diff changeset	5462 else {
05785bdf289c Use the new PyErr_WarnExplicit() API to issue better warnings for Guido van Rossum <guido@python.org> parents: 16838 diff changeset	5463 if (flags & DEF_LOCAL)
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5464 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5465 GLOBAL_AFTER_ASSIGN,
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5466 name);
16853 05785bdf289c Use the new PyErr_WarnExplicit() API to issue better warnings for Guido van Rossum <guido@python.org> parents: 16838 diff changeset	5467 else
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5468 PyOS_snprintf(buf, sizeof(buf),
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5469 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	5470 symtable_warn(st, buf);
16783 4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5471 }
4feea99be777 Add warnings about undefined "global" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16781 diff changeset	5472 }
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5473 symtable_add_def(st, name, DEF_GLOBAL);
5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5474 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5475 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5476
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5477 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	5478 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	5479 {
21086 ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5480 char tmpname[30];
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5481
ea5b0f0b716f code_repr(), com_addop_varname(), com_list_comprehension(), Barry Warsaw <barry@python.org> parents: 21066 diff changeset	5482 PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]", st->st_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	5483 symtable_add_def(st, tmpname, DEF_LOCAL);
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5484 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	5485 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	5486 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	5487 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	5488 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5489
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5490 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	5491 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	5492 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5493 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	5494 /* 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	5495 \| '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	5496 ('' \| 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	5497 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	5498 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5499 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	5500 node *dotname = CHILD(n, 1);
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5501 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	5502 /* check for bogus imports */
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5503 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	5504 PyErr_SetString(PyExc_SyntaxError,
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5505 LATE_FUTURE);
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16831 diff changeset	5506 PyErr_SyntaxLocation(st->st_filename,
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5507 n->n_lineno);
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5508 st->st_errors++;
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5509 return;
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5510 }
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	5511 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5512 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	5513 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	5514 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	5515 "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	5516 return;
19018 821e35706c07 Fix SF bug [ #445474 ] warn about import * inside functions Jeremy Hylton <jeremy@alum.mit.edu> parents: 18631 diff changeset	5517 }
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5518 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	5519 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	5520 } else {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5521 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	5522 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	5523 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	5524 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	5525 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	5526 else
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5527 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	5528 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	5529 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5530 }
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	5531 } 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	5532 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	5533 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	5534 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5535 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5536 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5537
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5538 /* 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	5539 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	5540 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	5541 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	5542 */
d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5543
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5544 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	5545 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	5546 {
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5547 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	5548 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	5549
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5550 loop:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5551 switch (TYPE(n)) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5552 case lambdef:
16357 9f2ca855fa44 Enforce two illegal import statements that were outlawed in the Jeremy Hylton <jeremy@alum.mit.edu> parents: 16353 diff changeset	5553 /* 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	5554 pass will catch this error. */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5555 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5556 case power:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5557 if (NCH(n) > 2) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5558 for (i = 2; i < NCH(n); ++i)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5559 if (TYPE(CHILD(n, i)) != DOUBLESTAR)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5560 symtable_node(st, CHILD(n, i));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5561 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5562 if (NCH(n) > 1) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5563 symtable_node(st, CHILD(n, 0));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5564 symtable_node(st, CHILD(n, 1));
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5565 } else {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5566 n = CHILD(n, 0);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5567 goto loop;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5568 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5569 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5570 case listmaker:
17076 85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	5571 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	5572 /* 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	5573 will catch it. */
85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	5574 return;
85d74f040712 Fix crashes in nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 16933 diff changeset	5575 } else {
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5576 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	5577 symtable_assign(st, CHILD(n, i), def_flag);
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 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5580 case exprlist:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5581 case testlist:
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 23280 diff changeset	5582 case testlist1:
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5583 if (NCH(n) == 1) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5584 n = CHILD(n, 0);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5585 goto loop;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5586 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5587 else {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5588 int i;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5589 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	5590 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	5591 return;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5592 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5593 case atom:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5594 tmp = CHILD(n, 0);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5595 if (TYPE(tmp) == LPAR \|\| TYPE(tmp) == LSQB) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5596 n = CHILD(n, 1);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5597 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	5598 } 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	5599 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	5600 PyErr_SetString(PyExc_SyntaxError,
13df8b6c2b80 Fix SF buf #480096: Assign to __debug__ still allowed Jeremy Hylton <jeremy@alum.mit.edu> parents: 20867 diff changeset	5601 ASSIGN_DEBUG);
13df8b6c2b80 Fix SF buf #480096: Assign to __debug__ still allowed Jeremy Hylton <jeremy@alum.mit.edu> parents: 20867 diff changeset	5602 PyErr_SyntaxLocation(st->st_filename,
21179 485422900ef0 SF bug #488687 reported by Neal Norwitz Jeremy Hylton <jeremy@alum.mit.edu> parents: 21086 diff changeset	5603 n->n_lineno);
20939 13df8b6c2b80 Fix SF buf #480096: Assign to __debug__ still allowed Jeremy Hylton <jeremy@alum.mit.edu> parents: 20867 diff changeset	5604 st->st_errors++;
13df8b6c2b80 Fix SF buf #480096: Assign to __debug__ still allowed Jeremy Hylton <jeremy@alum.mit.edu> parents: 20867 diff changeset	5605 }
20517 d51fe520e5fd Fix for SF bug [ #471928 ] global made w/nested list comprehensions Jeremy Hylton <jeremy@alum.mit.edu> parents: 20491 diff changeset	5606 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	5607 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5608 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5609 case dotted_as_name:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5610 if (NCH(n) == 3)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5611 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	5612 DEF_LOCAL \| def_flag);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5613 else
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5614 symtable_add_def(st,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5615 STR(CHILD(CHILD(n,
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5616 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	5617 DEF_LOCAL \| def_flag);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5618 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5619 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	5620 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	5621 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5622 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	5623 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	5624 return;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5625 default:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	5626 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	5627 return;
16677 b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	5628 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	5629 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	5630 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	5631 }
16677 b955e74955d5 Tolerate ill-formed trees in symtable_assign(). Fixes SF bug 132510. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16658 diff changeset	5632 /* 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	5633 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	5634 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	5635 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	5636 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	5637 }
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	5638 }

Mercurial > cpython-lru_cache-weakref

annotate Python/compile.c @ 24866:f0dbd5b49d8a legacy-trunk