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

annotate Python/compile.c @ 36664:7bfbfb2ef4e2 legacy-trunk

Stop generating empty arrays.

author	Martin v. Löwis <martin@v.loewis.de>
date	Sun, 26 Feb 2006 23:40:20 +0000
parents	7fdc639bc5b4
children	6165927431d6

rev	line source
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2 * This file compiles an abstract syntax tree (AST) into Python bytecode.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3 *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4 * The primary entry point is PyAST_Compile(), which returns a
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	5 * PyCodeObject. The compiler makes several passes to build the code
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	6 * object:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	7 * 1. Checks for future statements. See future.c
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	8 * 2. Builds a symbol table. See symtable.c.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	9 * 3. Generate code for basic blocks. See compiler_mod() in this file.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	10 * 4. Assemble the basic blocks into final code. See assemble() in
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	11 * this file.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	12 *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	13 * Note that compiler_mod() suggests module, but the module ast type
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	14 * (mod_ty) has cases for expressions and interactive statements.
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	15 *
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	16 * CAUTION: The VISIT_* macros abort the current function when they encounter
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	17 * a problem. So don't invoke them when there is memory which needs to be
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	18 * released. Code blocks are OK, as the compiler structure takes care of
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	19 * releasing those.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	20 */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	21
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	22 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	23
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	24 #include "Python-ast.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	25 #include "node.h"
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	26 #include "pyarena.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	27 #include "ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	28 #include "code.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	29 #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	30 #include "symtable.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31 #include "opcode.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	32
5164 8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	33 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	34
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	35 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	36 ISSUES:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	37
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	38 character encodings aren't handled
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	39
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	40 ref leaks in interpreter when press return on empty line
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	41
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	42 opcode_stack_effect() function should be reviewed since stack depth bugs
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	43 could be really hard to find later.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	44
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	45 Dead code is being generated (i.e. after unconditional jumps).
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	46 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	47
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	48 #define DEFAULT_BLOCK_SIZE 16
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	49 #define DEFAULT_BLOCKS 8
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	50 #define DEFAULT_CODE_SIZE 128
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	51 #define DEFAULT_LNOTAB_SIZE 16
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	52
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	53 struct instr {
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	54 unsigned i_jabs : 1;
56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	55 unsigned i_jrel : 1;
56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	56 unsigned i_hasarg : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	57 unsigned char i_opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	58 int i_oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	59 struct basicblock_ i_target; / target block (if jump instruction) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	60 int i_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	61 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	62
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	63 typedef struct basicblock_ {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	64 /* next block in the list of blocks for a unit (don't confuse with
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	65 * b_next) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	66 struct basicblock_ *b_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	67 /* number of instructions used */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	68 int b_iused;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	69 /* length of instruction array (b_instr) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	70 int b_ialloc;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	71 /* pointer to an array of instructions, initially NULL */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	72 struct instr *b_instr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	73 /* If b_next is non-NULL, it is a pointer to the next
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	74 block reached by normal control flow. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	75 struct basicblock_ *b_next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	76 /* b_seen is used to perform a DFS of basicblocks. */
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	77 unsigned b_seen : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	78 /* b_return is true if a RETURN_VALUE opcode is inserted. */
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	79 unsigned b_return : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	80 /* depth of stack upon entry of block, computed by stackdepth() */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	81 int b_startdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	82 /* instruction offset for block, computed by assemble_jump_offsets() */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	83 int b_offset;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	84 } basicblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	85
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	86 /* fblockinfo tracks the current frame block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	87
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	88 A frame block is used to handle loops, try/except, and try/finally.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	89 It's called a frame block to distinguish it from a basic block in the
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	90 compiler IR.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	91 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	92
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	93 enum fblocktype { LOOP, EXCEPT, FINALLY_TRY, FINALLY_END };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	94
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	95 struct fblockinfo {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	96 enum fblocktype fb_type;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	97 basicblock *fb_block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	98 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	99
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	100 /* The following items change on entry and exit of code blocks.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	101 They must be saved and restored when returning to a block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	102 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	103 struct compiler_unit {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	104 PySTEntryObject *u_ste;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	105
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	106 PyObject *u_name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	107 /* The following fields are dicts that map objects to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	108 the index of them in co_XXX. The index is used as
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	109 the argument for opcodes that refer to those collections.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	110 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	111 PyObject u_consts; / all constants */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	112 PyObject u_names; / all names */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	113 PyObject u_varnames; / local variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	114 PyObject u_cellvars; / cell variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	115 PyObject u_freevars; / free variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	116
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	117 PyObject u_private; / for private name mangling */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	118
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	119 int u_argcount; /* number of arguments for block */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	120 basicblock u_blocks; / pointer to list of blocks */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	121 basicblock u_curblock; / pointer to current block */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	122 int u_tmpname; /* temporary variables for list comps */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	123
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	124 int u_nfblocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	125 struct fblockinfo u_fblock[CO_MAXBLOCKS];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	126
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	127 int u_firstlineno; /* the first lineno of the block */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	128 int u_lineno; /* the lineno for the current stmt */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	129 bool u_lineno_set; /* boolean to indicate whether instr
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	130 has been generated with current lineno */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	131 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	132
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	133 /* This struct captures the global state of a compilation.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	134
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	135 The u pointer points to the current compilation unit, while units
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	136 for enclosing blocks are stored in c_stack. The u and c_stack are
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	137 managed by compiler_enter_scope() and compiler_exit_scope().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	138 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	139
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	140 struct compiler {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	141 const char *c_filename;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	142 struct symtable *c_st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	143 PyFutureFeatures c_future; / pointer to module's __future__ */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	144 PyCompilerFlags *c_flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	145
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	146 int c_interactive;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	147 int c_nestlevel;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	148
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	149 struct compiler_unit u; / compiler state for current block */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	150 PyObject c_stack; / Python list holding compiler_unit ptrs */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	151 char c_encoding; / source encoding (a borrowed reference) */
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	152 PyArena c_arena; / pointer to memory allocation arena */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	153 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	154
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	155 struct assembler {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	156 PyObject a_bytecode; / string containing bytecode */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	157 int a_offset; /* offset into bytecode */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	158 int a_nblocks; /* number of reachable blocks */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	159 basicblock *a_postorder; / list of blocks in dfs postorder */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	160 PyObject a_lnotab; / string containing lnotab */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	161 int a_lnotab_off; /* offset into lnotab */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	162 int a_lineno; /* last lineno of emitted instruction */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	163 int a_lineno_off; /* bytecode offset of last lineno */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	164 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	165
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	166 static int compiler_enter_scope(struct compiler , identifier, void , int);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	167 static void compiler_free(struct compiler *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	168 static basicblock compiler_new_block(struct compiler );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	169 static int compiler_next_instr(struct compiler , basicblock );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	170 static int compiler_addop(struct compiler *, int);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	171 static int compiler_addop_o(struct compiler , int, PyObject , PyObject *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	172 static int compiler_addop_i(struct compiler *, int, int);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	173 static int compiler_addop_j(struct compiler , int, basicblock , int);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	174 static basicblock compiler_use_new_block(struct compiler );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	175 static int compiler_error(struct compiler , const char );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	176 static int compiler_nameop(struct compiler *, identifier, expr_context_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	177
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	178 static PyCodeObject compiler_mod(struct compiler , mod_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	179 static int compiler_visit_stmt(struct compiler *, stmt_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	180 static int compiler_visit_keyword(struct compiler *, keyword_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	181 static int compiler_visit_expr(struct compiler *, expr_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	182 static int compiler_augassign(struct compiler *, stmt_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	183 static int compiler_visit_slice(struct compiler *, slice_ty,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	184 expr_context_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	185
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	186 static int compiler_push_fblock(struct compiler *, enum fblocktype,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	187 basicblock *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	188 static void compiler_pop_fblock(struct compiler *, enum fblocktype,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	189 basicblock *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	190
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	191 static int inplace_binop(struct compiler *, operator_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	192 static int expr_constant(expr_ty e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	193
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	194 static PyCodeObject assemble(struct compiler , int addNone);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	195 static PyObject *__doc__;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	196
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	197 PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	198 _Py_Mangle(PyObject private, PyObject ident)
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	199 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	200 /* Name mangling: __private becomes _classname__private.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	201 This is independent from how the name is used. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	202 const char p, name = PyString_AsString(ident);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	203 char *buffer;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	204 size_t nlen, plen;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	205 if (private == NULL \|\| name == NULL \|\| name[0] != '_' \|\| name[1] != '_') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	206 Py_INCREF(ident);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	207 return ident;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	208 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	209 p = PyString_AsString(private);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	210 nlen = strlen(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	211 if (name[nlen-1] == '_' && name[nlen-2] == '_') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	212 Py_INCREF(ident);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	213 return ident; /* Don't mangle __whatever__ */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	214 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	215 /* Strip leading underscores from class name */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	216 while (*p == '_')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	217 p++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	218 if (*p == '\0') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	219 Py_INCREF(ident);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	220 return ident; /* Don't mangle if class is just underscores */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	221 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	222 plen = strlen(p);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	223 ident = PyString_FromStringAndSize(NULL, 1 + nlen + plen);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	224 if (!ident)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	225 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	226 /* ident = "_" + p[:plen] + name # i.e. 1+plen+nlen bytes */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	227 buffer = PyString_AS_STRING(ident);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	228 buffer[0] = '_';
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	229 strncpy(buffer+1, p, plen);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	230 strcpy(buffer+1+plen, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	231 return ident;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	232 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	233
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	234 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	235 compiler_init(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	236 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	237 memset(c, 0, sizeof(struct compiler));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	238
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	239 c->c_stack = PyList_New(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	240 if (!c->c_stack)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	241 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	242
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	243 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	244 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	245
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	246 PyCodeObject *
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	247 PyAST_Compile(mod_ty mod, const char filename, PyCompilerFlags flags,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	248 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	249 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	250 struct compiler c;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	251 PyCodeObject *co = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	252 PyCompilerFlags local_flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	253 int merged;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	254
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	255 if (!__doc__) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	256 __doc__ = PyString_InternFromString("__doc__");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	257 if (!__doc__)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	258 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	259 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	260
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	261 if (!compiler_init(&c))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	262 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	263 c.c_filename = filename;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	264 c.c_arena = arena;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	265 c.c_future = PyFuture_FromAST(mod, filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	266 if (c.c_future == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	267 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	268 if (!flags) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	269 local_flags.cf_flags = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	270 flags = &local_flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	271 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	272 merged = c.c_future->ff_features \| flags->cf_flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	273 c.c_future->ff_features = merged;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	274 flags->cf_flags = merged;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	275 c.c_flags = flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	276 c.c_nestlevel = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	277
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	278 c.c_st = PySymtable_Build(mod, filename, c.c_future);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	279 if (c.c_st == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	280 if (!PyErr_Occurred())
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	281 PyErr_SetString(PyExc_SystemError, "no symtable");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	282 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	283 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	284
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	285 /* XXX initialize to NULL for now, need to handle */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	286 c.c_encoding = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	287
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	288 co = compiler_mod(&c, mod);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	289
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	290 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	291 compiler_free(&c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	292 return co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	293 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	294
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	295 PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	296 PyNode_Compile(struct _node n, const char filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	297 {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	298 PyCodeObject *co = NULL;
36084 301fb0a99371 fixed compilation with an ordinary C89 compiler Fredrik Lundh <fredrik@pythonware.com> parents: 36081 diff changeset	299 PyArena *arena = PyArena_New();
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	300 mod_ty mod = PyAST_FromNode(n, NULL, filename, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	301 if (mod)
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	302 co = PyAST_Compile(mod, filename, NULL, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	303 PyArena_Free(arena);
30428 c2c10f1eb8e2 Fix leak discovered in test_new by Michael Hudson. Raymond Hettinger <python@rcn.com> parents: 30226 diff changeset	304 return co;
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	305 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	306
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	307 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	308 compiler_free(struct compiler *c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	309 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	310 if (c->c_st)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	311 PySymtable_Free(c->c_st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	312 if (c->c_future)
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	313 PyMem_Free(c->c_future);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	314 Py_DECREF(c->c_stack);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	315 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	316
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	317 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	318 list2dict(PyObject *list)
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	319 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	320 Py_ssize_t i, n;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	321 PyObject v, k, *dict = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	322
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	323 n = PyList_Size(list);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	324 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	325 v = PyInt_FromLong(i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	326 if (!v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	327 Py_DECREF(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	328 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	329 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	330 k = PyList_GET_ITEM(list, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	331 k = Py_BuildValue("(OO)", k, k->ob_type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	332 if (k == NULL \|\| PyDict_SetItem(dict, k, v) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	333 Py_XDECREF(k);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	334 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	335 Py_DECREF(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	336 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	337 }
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	338 Py_DECREF(k);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	339 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	340 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	341 return dict;
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	342 }
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	343
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	344 /* Return new dict containing names from src that match scope(s).
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	345
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	346 src is a symbol table dictionary. If the scope of a name matches
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	347 either scope_type or flag is set, insert it into the new dict. The
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	348 values are integers, starting at offset and increasing by one for
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	349 each key.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	350 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	351
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	352 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	353 dictbytype(PyObject *src, int scope_type, int flag, int offset)
16006 51811d78a9da SF Patch #103250, by pj99: Optimize a strspn() out of startup. Guido van Rossum <guido@python.org> parents: 15438 diff changeset	354 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	355 Py_ssize_t pos = 0, i = offset, scope;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	356 PyObject k, v, *dest = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	357
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	358 assert(offset >= 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	359 if (dest == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	360 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	361
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	362 while (PyDict_Next(src, &pos, &k, &v)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	363 /* XXX this should probably be a macro in symtable.h */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	364 assert(PyInt_Check(v));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	365 scope = (PyInt_AS_LONG(v) >> SCOPE_OFF) & SCOPE_MASK;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	366
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	367 if (scope == scope_type \|\| PyInt_AS_LONG(v) & flag) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	368 PyObject tuple, item = PyInt_FromLong(i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	369 if (item == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	370 Py_DECREF(dest);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	371 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	372 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	373 i++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	374 tuple = Py_BuildValue("(OO)", k, k->ob_type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	375 if (!tuple \|\| PyDict_SetItem(dest, tuple, item) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	376 Py_DECREF(item);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	377 Py_DECREF(dest);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	378 Py_XDECREF(tuple);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	379 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	380 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	381 Py_DECREF(item);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	382 Py_DECREF(tuple);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	383 }
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	384 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	385 return dest;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	386 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	387
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	388 /* Begin: Peephole optimizations ----------------------------------------- */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	389
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	390 #define GETARG(arr, i) ((int)((arr[i+2]<<8) + arr[i+1]))
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	391 #define UNCONDITIONAL_JUMP(op) (op==JUMP_ABSOLUTE \|\| op==JUMP_FORWARD)
28417 1a2fd109f6b6 Factored out test for absolute jumps. Raymond Hettinger <python@rcn.com> parents: 28406 diff changeset	392 #define ABSOLUTE_JUMP(op) (op==JUMP_ABSOLUTE \|\| op==CONTINUE_LOOP)
1a2fd109f6b6 Factored out test for absolute jumps. Raymond Hettinger <python@rcn.com> parents: 28406 diff changeset	393 #define GETJUMPTGT(arr, i) (GETARG(arr,i) + (ABSOLUTE_JUMP(arr[i]) ? 0 : i+3))
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	394 #define SETARG(arr, i, val) arr[i+2] = val>>8; arr[i+1] = val & 255
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	395 #define CODESIZE(op) (HAS_ARG(op) ? 3 : 1)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	396 #define ISBASICBLOCK(blocks, start, bytes) (blocks[start]==blocks[start+bytes-1])
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	397
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	398 /* Replace LOAD_CONST c1. LOAD_CONST c2 ... LOAD_CONST cn BUILD_TUPLE n
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	399 with LOAD_CONST (c1, c2, ... cn).
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	400 The consts table must still be in list form so that the
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	401 new constant (c1, c2, ... cn) can be appended.
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	402 Called with codestr pointing to the first LOAD_CONST.
34553 cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	403 Bails out with no change if one or more of the LOAD_CONSTs is missing.
cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	404 Also works for BUILD_LIST when followed by an "in" or "not in" test.
cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	405 */
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	406 static int
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	407 tuple_of_constants(unsigned char codestr, int n, PyObject consts)
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	408 {
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	409 PyObject newconst, constant;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	410 Py_ssize_t i, arg, len_consts;
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	411
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	412 /* Pre-conditions */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	413 assert(PyList_CheckExact(consts));
34553 cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	414 assert(codestr[n3] == BUILD_TUPLE \|\| codestr[n3] == BUILD_LIST);
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	415 assert(GETARG(codestr, (n*3)) == n);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	416 for (i=0 ; i<n ; i++)
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	417 assert(codestr[i*3] == LOAD_CONST);
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	418
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	419 /* Buildup new tuple of constants */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	420 newconst = PyTuple_New(n);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	421 if (newconst == NULL)
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	422 return 0;
33838 fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	423 len_consts = PyList_GET_SIZE(consts);
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	424 for (i=0 ; i<n ; i++) {
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	425 arg = GETARG(codestr, (i*3));
33838 fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	426 assert(arg < len_consts);
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	427 constant = PyList_GET_ITEM(consts, arg);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	428 Py_INCREF(constant);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	429 PyTuple_SET_ITEM(newconst, i, constant);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	430 }
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	431
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	432 /* Append folded constant onto consts */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	433 if (PyList_Append(consts, newconst)) {
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	434 Py_DECREF(newconst);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	435 return 0;
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	436 }
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	437 Py_DECREF(newconst);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	438
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	439 /* Write NOPs over old LOAD_CONSTS and
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	440 add a new LOAD_CONST newconst on top of the BUILD_TUPLE n */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	441 memset(codestr, NOP, n*3);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	442 codestr[n*3] = LOAD_CONST;
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	443 SETARG(codestr, (n*3), len_consts);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	444 return 1;
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	445 }
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	446
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	447 /* Replace LOAD_CONST c1. LOAD_CONST c2 BINOP
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	448 with LOAD_CONST binop(c1,c2)
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	449 The consts table must still be in list form so that the
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	450 new constant can be appended.
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	451 Called with codestr pointing to the first LOAD_CONST.
34506 bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	452 Abandons the transformation if the folding fails (i.e. 1+'a').
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	453 If the new constant is a sequence, only folds when the size
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	454 is below a threshold value. That keeps pyc files from
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	455 becoming large in the presence of code like: (None,)*1000.
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	456 */
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	457 static int
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	458 fold_binops_on_constants(unsigned char codestr, PyObject consts)
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	459 {
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	460 PyObject newconst, v, *w;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	461 Py_ssize_t len_consts, size;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	462 int opcode;
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	463
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	464 /* Pre-conditions */
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	465 assert(PyList_CheckExact(consts));
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	466 assert(codestr[0] == LOAD_CONST);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	467 assert(codestr[3] == LOAD_CONST);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	468
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	469 /* Create new constant */
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	470 v = PyList_GET_ITEM(consts, GETARG(codestr, 0));
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	471 w = PyList_GET_ITEM(consts, GETARG(codestr, 3));
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	472 opcode = codestr[6];
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	473 switch (opcode) {
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	474 case BINARY_POWER:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	475 newconst = PyNumber_Power(v, w, Py_None);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	476 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	477 case BINARY_MULTIPLY:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	478 newconst = PyNumber_Multiply(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	479 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	480 case BINARY_DIVIDE:
34506 bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	481 /* Cannot fold this operation statically since
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	482 the result can depend on the run-time presence of the -Qnew flag */
34359 d81b6173f050 Re-running python with/without the -Qnew flag uses incorrectly optimized Armin Rigo <arigo@tunes.org> parents: 34305 diff changeset	483 return 0;
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	484 case BINARY_TRUE_DIVIDE:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	485 newconst = PyNumber_TrueDivide(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	486 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	487 case BINARY_FLOOR_DIVIDE:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	488 newconst = PyNumber_FloorDivide(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	489 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	490 case BINARY_MODULO:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	491 newconst = PyNumber_Remainder(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	492 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	493 case BINARY_ADD:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	494 newconst = PyNumber_Add(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	495 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	496 case BINARY_SUBTRACT:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	497 newconst = PyNumber_Subtract(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	498 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	499 case BINARY_SUBSCR:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	500 newconst = PyObject_GetItem(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	501 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	502 case BINARY_LSHIFT:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	503 newconst = PyNumber_Lshift(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	504 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	505 case BINARY_RSHIFT:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	506 newconst = PyNumber_Rshift(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	507 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	508 case BINARY_AND:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	509 newconst = PyNumber_And(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	510 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	511 case BINARY_XOR:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	512 newconst = PyNumber_Xor(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	513 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	514 case BINARY_OR:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	515 newconst = PyNumber_Or(v, w);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	516 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	517 default:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	518 /* Called with an unknown opcode */
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	519 PyErr_Format(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	520 "unexpected binary operation %d on a constant",
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	521 opcode);
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	522 return 0;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	523 }
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	524 if (newconst == NULL) {
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	525 PyErr_Clear();
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	526 return 0;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	527 }
34506 bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	528 size = PyObject_Size(newconst);
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	529 if (size == -1)
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	530 PyErr_Clear();
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	531 else if (size > 20) {
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	532 Py_DECREF(newconst);
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	533 return 0;
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	534 }
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	535
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	536 /* Append folded constant into consts table */
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	537 len_consts = PyList_GET_SIZE(consts);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	538 if (PyList_Append(consts, newconst)) {
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	539 Py_DECREF(newconst);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	540 return 0;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	541 }
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	542 Py_DECREF(newconst);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	543
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	544 /* Write NOP NOP NOP NOP LOAD_CONST newconst */
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	545 memset(codestr, NOP, 4);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	546 codestr[4] = LOAD_CONST;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	547 SETARG(codestr, 4, len_consts);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	548 return 1;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	549 }
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	550
34622 516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	551 static int
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	552 fold_unaryops_on_constants(unsigned char codestr, PyObject consts)
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	553 {
34630 660419bdb4ae Preserve sign of -0.0 when result is run through marshal. Raymond Hettinger <python@rcn.com> parents: 34626 diff changeset	554 PyObject newconst=NULL, v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	555 Py_ssize_t len_consts;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	556 int opcode;
34622 516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	557
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	558 /* Pre-conditions */
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	559 assert(PyList_CheckExact(consts));
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	560 assert(codestr[0] == LOAD_CONST);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	561
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	562 /* Create new constant */
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	563 v = PyList_GET_ITEM(consts, GETARG(codestr, 0));
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	564 opcode = codestr[3];
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	565 switch (opcode) {
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	566 case UNARY_NEGATIVE:
34630 660419bdb4ae Preserve sign of -0.0 when result is run through marshal. Raymond Hettinger <python@rcn.com> parents: 34626 diff changeset	567 /* Preserve the sign of -0.0 */
660419bdb4ae Preserve sign of -0.0 when result is run through marshal. Raymond Hettinger <python@rcn.com> parents: 34626 diff changeset	568 if (PyObject_IsTrue(v) == 1)
660419bdb4ae Preserve sign of -0.0 when result is run through marshal. Raymond Hettinger <python@rcn.com> parents: 34626 diff changeset	569 newconst = PyNumber_Negative(v);
34622 516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	570 break;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	571 case UNARY_CONVERT:
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	572 newconst = PyObject_Repr(v);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	573 break;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	574 case UNARY_INVERT:
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	575 newconst = PyNumber_Invert(v);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	576 break;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	577 default:
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	578 /* Called with an unknown opcode */
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	579 PyErr_Format(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	580 "unexpected unary operation %d on a constant",
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	581 opcode);
34622 516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	582 return 0;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	583 }
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	584 if (newconst == NULL) {
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	585 PyErr_Clear();
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	586 return 0;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	587 }
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	588
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	589 /* Append folded constant into consts table */
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	590 len_consts = PyList_GET_SIZE(consts);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	591 if (PyList_Append(consts, newconst)) {
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	592 Py_DECREF(newconst);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	593 return 0;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	594 }
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	595 Py_DECREF(newconst);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	596
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	597 /* Write NOP LOAD_CONST newconst */
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	598 codestr[0] = NOP;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	599 codestr[1] = LOAD_CONST;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	600 SETARG(codestr, 1, len_consts);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	601 return 1;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	602 }
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	603
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	604 static unsigned int *
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	605 markblocks(unsigned char *code, int len)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	606 {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	607 unsigned int blocks = PyMem_Malloc(lensizeof(int));
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	608 int i,j, opcode, blockcnt = 0;
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	609
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	610 if (blocks == NULL)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	611 return NULL;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	612 memset(blocks, 0, len*sizeof(int));
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	613
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	614 /* Mark labels in the first pass */
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	615 for (i=0 ; i<len ; i+=CODESIZE(opcode)) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	616 opcode = code[i];
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	617 switch (opcode) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	618 case FOR_ITER:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	619 case JUMP_FORWARD:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	620 case JUMP_IF_FALSE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	621 case JUMP_IF_TRUE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	622 case JUMP_ABSOLUTE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	623 case CONTINUE_LOOP:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	624 case SETUP_LOOP:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	625 case SETUP_EXCEPT:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	626 case SETUP_FINALLY:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	627 j = GETJUMPTGT(code, i);
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	628 blocks[j] = 1;
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	629 break;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	630 }
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	631 }
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	632 /* Build block numbers in the second pass */
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	633 for (i=0 ; i<len ; i++) {
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	634 blockcnt += blocks[i]; /* increment blockcnt over labels */
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	635 blocks[i] = blockcnt;
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	636 }
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	637 return blocks;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	638 }
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	639
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	640 /* Perform basic peephole optimizations to components of a code object.
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	641 The consts object should still be in list form to allow new constants
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	642 to be appended.
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	643
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	644 To keep the optimizer simple, it bails out (does nothing) for code
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	645 containing extended arguments or that has a length over 32,700. That
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	646 allows us to avoid overflow and sign issues. Likewise, it bails when
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	647 the lineno table has complex encoding for gaps >= 255.
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	648
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	649 Optimizations are restricted to simple transformations occuring within a
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	650 single basic block. All transformations keep the code size the same or
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	651 smaller. For those that reduce size, the gaps are initially filled with
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	652 NOPs. Later those NOPs are removed and the jump addresses retargeted in
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	653 a single pass. Line numbering is adjusted accordingly. */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	654
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	655 static PyObject *
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	656 optimize_code(PyObject code, PyObject consts, PyObject names, PyObject lineno_obj)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	657 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	658 Py_ssize_t i, j, codelen;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	659 int nops, h, adj;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	660 int tgt, tgttgt, opcode;
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	661 unsigned char *codestr = NULL;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	662 unsigned char *lineno;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	663 int *addrmap = NULL;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	664 int new_line, cum_orig_line, last_line, tabsiz;
33838 fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	665 int cumlc=0, lastlc=0; /* Count runs of consecutive LOAD_CONST codes */
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	666 unsigned int *blocks = NULL;
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	667 char *name;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	668
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	669 /* Bail out if an exception is set */
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	670 if (PyErr_Occurred())
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	671 goto exitUnchanged;
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	672
33272 bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	673 /* Bypass optimization when the lineno table is too complex */
bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	674 assert(PyString_Check(lineno_obj));
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 34696 diff changeset	675 lineno = (unsigned char*)PyString_AS_STRING(lineno_obj);
33272 bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	676 tabsiz = PyString_GET_SIZE(lineno_obj);
bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	677 if (memchr(lineno, 255, tabsiz) != NULL)
bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	678 goto exitUnchanged;
bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	679
33249 c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	680 /* Avoid situations where jump retargeting could overflow */
33620 27aa0e119330 Replaced a test with an assertion. Raymond Hettinger <python@rcn.com> parents: 33539 diff changeset	681 assert(PyString_Check(code));
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	682 codelen = PyString_Size(code);
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	683 if (codelen > 32700)
33249 c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	684 goto exitUnchanged;
c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	685
c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	686 /* Make a modifiable copy of the code string */
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	687 codestr = PyMem_Malloc(codelen);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	688 if (codestr == NULL)
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	689 goto exitUnchanged;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	690 codestr = memcpy(codestr, PyString_AS_STRING(code), codelen);
32977 40c3a51cb71c SF bug #1004088: big code objects (>64K) may be optimized incorrectly Raymond Hettinger <python@rcn.com> parents: 32956 diff changeset	691
34626 fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	692 /* Verify that RETURN_VALUE terminates the codestring. This allows
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	693 the various transformation patterns to look ahead several
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	694 instructions without additional checks to make sure they are not
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	695 looking beyond the end of the code string.
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	696 */
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	697 if (codestr[codelen-1] != RETURN_VALUE)
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	698 goto exitUnchanged;
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	699
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	700 /* Mapping to new jump targets after NOPs are removed */
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	701 addrmap = PyMem_Malloc(codelen * sizeof(int));
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	702 if (addrmap == NULL)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	703 goto exitUnchanged;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	704
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	705 blocks = markblocks(codestr, codelen);
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	706 if (blocks == NULL)
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	707 goto exitUnchanged;
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	708 assert(PyList_Check(consts));
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	709
33875 24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	710 for (i=0 ; i<codelen ; i += CODESIZE(codestr[i])) {
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	711 opcode = codestr[i];
33838 fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	712
fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	713 lastlc = cumlc;
fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	714 cumlc = 0;
fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	715
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	716 switch (opcode) {
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	717
32402 1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	718 /* Replace UNARY_NOT JUMP_IF_FALSE POP_TOP with
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	719 with JUMP_IF_TRUE POP_TOP */
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	720 case UNARY_NOT:
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	721 if (codestr[i+1] != JUMP_IF_FALSE \|\|
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	722 codestr[i+4] != POP_TOP \|\|
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	723 !ISBASICBLOCK(blocks,i,5))
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	724 continue;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	725 tgt = GETJUMPTGT(codestr, (i+1));
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	726 if (codestr[tgt] != POP_TOP)
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	727 continue;
32402 1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	728 j = GETARG(codestr, i+1) + 1;
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	729 codestr[i] = JUMP_IF_TRUE;
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	730 SETARG(codestr, i, j);
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	731 codestr[i+3] = POP_TOP;
1c2baae14828 Move NOP to end of code transformation. Raymond Hettinger <python@rcn.com> parents: 32395 diff changeset	732 codestr[i+4] = NOP;
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	733 break;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	734
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	735 /* not a is b --> a is not b
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	736 not a in b --> a not in b
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	737 not a is not b --> a is b
34574 369e8e71ea33 Remove the set conversion which didn't work with: [] in (0,) Raymond Hettinger <python@rcn.com> parents: 34571 diff changeset	738 not a not in b --> a in b
34547 835b645a168f Transform "x in (1,2,3)" to "x in frozenset([1,2,3])". Raymond Hettinger <python@rcn.com> parents: 34506 diff changeset	739 */
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	740 case COMPARE_OP:
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	741 j = GETARG(codestr, i);
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	742 if (j < 6 \|\| j > 9 \|\|
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	743 codestr[i+3] != UNARY_NOT \|\|
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	744 !ISBASICBLOCK(blocks,i,4))
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	745 continue;
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	746 SETARG(codestr, i, (j^1));
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	747 codestr[i+3] = NOP;
32717 0e890ac1c0f2 optimize_code(): Repaired gross error in new special-casing for None. Tim Peters <tim.peters@gmail.com> parents: 32711 diff changeset	748 break;
0e890ac1c0f2 optimize_code(): Repaired gross error in new special-casing for None. Tim Peters <tim.peters@gmail.com> parents: 32711 diff changeset	749
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	750 /* Replace LOAD_GLOBAL/LOAD_NAME None with LOAD_CONST None */
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	751 case LOAD_NAME:
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	752 case LOAD_GLOBAL:
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	753 j = GETARG(codestr, i);
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	754 name = PyString_AsString(PyTuple_GET_ITEM(names, j));
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	755 if (name == NULL \|\| strcmp(name, "None") != 0)
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	756 continue;
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	757 for (j=0 ; j < PyList_GET_SIZE(consts) ; j++) {
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	758 if (PyList_GET_ITEM(consts, j) == Py_None) {
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	759 codestr[i] = LOAD_CONST;
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	760 SETARG(codestr, i, j);
33880 8a09c82e4261 Maintain peepholer's cumlc invariant by updating the running total Raymond Hettinger <python@rcn.com> parents: 33875 diff changeset	761 cumlc = lastlc + 1;
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	762 break;
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	763 }
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	764 }
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	765 break;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32305 diff changeset	766
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	767 /* Skip over LOAD_CONST trueconst JUMP_IF_FALSE xx POP_TOP */
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	768 case LOAD_CONST:
33838 fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	769 cumlc = lastlc + 1;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	770 j = GETARG(codestr, i);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	771 if (codestr[i+3] != JUMP_IF_FALSE \|\|
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	772 codestr[i+6] != POP_TOP \|\|
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	773 !ISBASICBLOCK(blocks,i,7) \|\|
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	774 !PyObject_IsTrue(PyList_GET_ITEM(consts, j)))
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	775 continue;
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	776 memset(codestr+i, NOP, 7);
33880 8a09c82e4261 Maintain peepholer's cumlc invariant by updating the running total Raymond Hettinger <python@rcn.com> parents: 33875 diff changeset	777 cumlc = 0;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	778 break;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	779
34553 cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	780 /* Try to fold tuples of constants (includes a case for lists
cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	781 which are only used for "in" and "not in" tests).
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	782 Skip over BUILD_SEQN 1 UNPACK_SEQN 1.
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	783 Replace BUILD_SEQN 2 UNPACK_SEQN 2 with ROT2.
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	784 Replace BUILD_SEQN 3 UNPACK_SEQN 3 with ROT3 ROT2. */
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	785 case BUILD_TUPLE:
34553 cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	786 case BUILD_LIST:
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	787 j = GETARG(codestr, i);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	788 h = i - 3 * j;
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	789 if (h >= 0 &&
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	790 j <= lastlc &&
34647 a9f161e36bf9 Silence a gcc warning about putting in parentheses around && expressions mixed Brett Cannon <bcannon@gmail.com> parents: 34630 diff changeset	791 ((opcode == BUILD_TUPLE &&
a9f161e36bf9 Silence a gcc warning about putting in parentheses around && expressions mixed Brett Cannon <bcannon@gmail.com> parents: 34630 diff changeset	792 ISBASICBLOCK(blocks, h, 3*(j+1))) \|\|
a9f161e36bf9 Silence a gcc warning about putting in parentheses around && expressions mixed Brett Cannon <bcannon@gmail.com> parents: 34630 diff changeset	793 (opcode == BUILD_LIST &&
34553 cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	794 codestr[i+3]==COMPARE_OP &&
cd04f2d18a6f Adopt Skip's idea to optimize lists of constants in the context Raymond Hettinger <python@rcn.com> parents: 34547 diff changeset	795 ISBASICBLOCK(blocks, h, 3*(j+2)) &&
34647 a9f161e36bf9 Silence a gcc warning about putting in parentheses around && expressions mixed Brett Cannon <bcannon@gmail.com> parents: 34630 diff changeset	796 (GETARG(codestr,i+3)==6 \|\|
a9f161e36bf9 Silence a gcc warning about putting in parentheses around && expressions mixed Brett Cannon <bcannon@gmail.com> parents: 34630 diff changeset	797 GETARG(codestr,i+3)==7))) &&
a9f161e36bf9 Silence a gcc warning about putting in parentheses around && expressions mixed Brett Cannon <bcannon@gmail.com> parents: 34630 diff changeset	798 tuple_of_constants(&codestr[h], j, consts)) {
33880 8a09c82e4261 Maintain peepholer's cumlc invariant by updating the running total Raymond Hettinger <python@rcn.com> parents: 33875 diff changeset	799 assert(codestr[i] == LOAD_CONST);
8a09c82e4261 Maintain peepholer's cumlc invariant by updating the running total Raymond Hettinger <python@rcn.com> parents: 33875 diff changeset	800 cumlc = 1;
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	801 break;
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	802 }
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	803 if (codestr[i+3] != UNPACK_SEQUENCE \|\|
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	804 !ISBASICBLOCK(blocks,i,6) \|\|
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	805 j != GETARG(codestr, i+3))
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	806 continue;
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	807 if (j == 1) {
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	808 memset(codestr+i, NOP, 6);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	809 } else if (j == 2) {
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	810 codestr[i] = ROT_TWO;
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	811 memset(codestr+i+1, NOP, 5);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	812 } else if (j == 3) {
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	813 codestr[i] = ROT_THREE;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	814 codestr[i+1] = ROT_TWO;
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	815 memset(codestr+i+2, NOP, 4);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	816 }
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	817 break;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	818
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	819 /* Fold binary ops on constants.
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	820 LOAD_CONST c1 LOAD_CONST c2 BINOP --> LOAD_CONST binop(c1,c2) */
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	821 case BINARY_POWER:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	822 case BINARY_MULTIPLY:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	823 case BINARY_TRUE_DIVIDE:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	824 case BINARY_FLOOR_DIVIDE:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	825 case BINARY_MODULO:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	826 case BINARY_ADD:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	827 case BINARY_SUBTRACT:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	828 case BINARY_SUBSCR:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	829 case BINARY_LSHIFT:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	830 case BINARY_RSHIFT:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	831 case BINARY_AND:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	832 case BINARY_XOR:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	833 case BINARY_OR:
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	834 if (lastlc >= 2 &&
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	835 ISBASICBLOCK(blocks, i-6, 7) &&
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	836 fold_binops_on_constants(&codestr[i-6], consts)) {
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	837 i -= 2;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	838 assert(codestr[i] == LOAD_CONST);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	839 cumlc = 1;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	840 }
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	841 break;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	842
34622 516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	843 /* Fold unary ops on constants.
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	844 LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) */
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	845 case UNARY_NEGATIVE:
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	846 case UNARY_CONVERT:
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	847 case UNARY_INVERT:
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	848 if (lastlc >= 1 &&
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	849 ISBASICBLOCK(blocks, i-3, 4) &&
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	850 fold_unaryops_on_constants(&codestr[i-3], consts)) {
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	851 i -= 2;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	852 assert(codestr[i] == LOAD_CONST);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	853 cumlc = 1;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	854 }
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	855 break;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	856
33259 b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	857 /* Simplify conditional jump to conditional jump where the
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	858 result of the first test implies the success of a similar
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	859 test or the failure of the opposite test.
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	860 Arises in code like:
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	861 "if a and b:"
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	862 "if a or b:"
33259 b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	863 "a and b or c"
33861 4a3eaa1aa3af Fixed a comment and added another one. Armin Rigo <arigo@tunes.org> parents: 33860 diff changeset	864 "(a and b) and c"
33259 b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	865 x:JUMP_IF_FALSE y y:JUMP_IF_FALSE z --> x:JUMP_IF_FALSE z
33271 3dbdbd572d94 Fix typo in comment and add clarification. Raymond Hettinger <python@rcn.com> parents: 33259 diff changeset	866 x:JUMP_IF_FALSE y y:JUMP_IF_TRUE z --> x:JUMP_IF_FALSE y+3
3dbdbd572d94 Fix typo in comment and add clarification. Raymond Hettinger <python@rcn.com> parents: 33259 diff changeset	867 where y+3 is the instruction following the second test.
33259 b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	868 */
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	869 case JUMP_IF_FALSE:
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	870 case JUMP_IF_TRUE:
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	871 tgt = GETJUMPTGT(codestr, i);
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	872 j = codestr[tgt];
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	873 if (j == JUMP_IF_FALSE \|\| j == JUMP_IF_TRUE) {
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	874 if (j == opcode) {
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	875 tgttgt = GETJUMPTGT(codestr, tgt) - i - 3;
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	876 SETARG(codestr, i, tgttgt);
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	877 } else {
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	878 tgt -= i;
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	879 SETARG(codestr, i, tgt);
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	880 }
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	881 break;
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	882 }
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	883 /* Intentional fallthrough */
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	884
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	885 /* Replace jumps to unconditional jumps */
28610 67d36f4dfea1 Extend SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28417 diff changeset	886 case FOR_ITER:
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	887 case JUMP_FORWARD:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	888 case JUMP_ABSOLUTE:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	889 case CONTINUE_LOOP:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	890 case SETUP_LOOP:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	891 case SETUP_EXCEPT:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	892 case SETUP_FINALLY:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	893 tgt = GETJUMPTGT(codestr, i);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	894 if (!UNCONDITIONAL_JUMP(codestr[tgt]))
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	895 continue;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	896 tgttgt = GETJUMPTGT(codestr, tgt);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	897 if (opcode == JUMP_FORWARD) /* JMP_ABS can go backwards */
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	898 opcode = JUMP_ABSOLUTE;
28417 1a2fd109f6b6 Factored out test for absolute jumps. Raymond Hettinger <python@rcn.com> parents: 28406 diff changeset	899 if (!ABSOLUTE_JUMP(opcode))
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	900 tgttgt -= i + 3; /* Calc relative jump addr */
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	901 if (tgttgt < 0) /* No backward relative jumps */
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	902 continue;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	903 codestr[i] = opcode;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	904 SETARG(codestr, i, tgttgt);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	905 break;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	906
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	907 case EXTENDED_ARG:
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	908 goto exitUnchanged;
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	909
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	910 /* Replace RETURN LOAD_CONST None RETURN with just RETURN */
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	911 case RETURN_VALUE:
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	912 if (i+4 >= codelen \|\|
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	913 codestr[i+4] != RETURN_VALUE \|\|
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	914 !ISBASICBLOCK(blocks,i,5))
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	915 continue;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	916 memset(codestr+i+1, NOP, 4);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	917 break;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	918 }
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	919 }
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	920
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	921 /* Fixup linenotab */
33875 24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	922 for (i=0, nops=0 ; i<codelen ; i += CODESIZE(codestr[i])) {
24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	923 addrmap[i] = i - nops;
24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	924 if (codestr[i] == NOP)
24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	925 nops++;
24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	926 }
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	927 cum_orig_line = 0;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	928 last_line = 0;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	929 for (i=0 ; i < tabsiz ; i+=2) {
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	930 cum_orig_line += lineno[i];
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	931 new_line = addrmap[cum_orig_line];
33272 bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	932 assert (new_line - last_line < 255);
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	933 lineno[i] =((unsigned char)(new_line - last_line));
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	934 last_line = new_line;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	935 }
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	936
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	937 /* Remove NOPs and fixup jump targets */
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	938 for (i=0, h=0 ; i<codelen ; ) {
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	939 opcode = codestr[i];
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	940 switch (opcode) {
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	941 case NOP:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	942 i++;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	943 continue;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	944
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	945 case JUMP_ABSOLUTE:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	946 case CONTINUE_LOOP:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	947 j = addrmap[GETARG(codestr, i)];
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	948 SETARG(codestr, i, j);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	949 break;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	950
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	951 case FOR_ITER:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	952 case JUMP_FORWARD:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	953 case JUMP_IF_FALSE:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	954 case JUMP_IF_TRUE:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	955 case SETUP_LOOP:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	956 case SETUP_EXCEPT:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	957 case SETUP_FINALLY:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	958 j = addrmap[GETARG(codestr, i) + i + 3] - addrmap[i] - 3;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	959 SETARG(codestr, i, j);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	960 break;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	961 }
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	962 adj = CODESIZE(opcode);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	963 while (adj--)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	964 codestr[h++] = codestr[i++];
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	965 }
33249 c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	966 assert(h + nops == codelen);
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	967
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	968 code = PyString_FromStringAndSize((char *)codestr, h);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	969 PyMem_Free(addrmap);
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	970 PyMem_Free(codestr);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	971 PyMem_Free(blocks);
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	972 return code;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	973
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	974 exitUnchanged:
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	975 if (blocks != NULL)
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	976 PyMem_Free(blocks);
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	977 if (addrmap != NULL)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	978 PyMem_Free(addrmap);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	979 if (codestr != NULL)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	980 PyMem_Free(codestr);
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	981 Py_INCREF(code);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	982 return code;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	983 }
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	984
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	985 /* End: Peephole optimizations ----------------------------------------- */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	986
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	987 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	988
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	989 Leave this debugging code for just a little longer.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	990
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	991 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	992 compiler_display_symbols(PyObject name, PyObject symbols)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	993 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	994 PyObject key, value;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	995 int flags;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	996 Py_ssize_t pos = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	997
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	998 fprintf(stderr, "block %s\n", PyString_AS_STRING(name));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	999 while (PyDict_Next(symbols, &pos, &key, &value)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1000 flags = PyInt_AsLong(value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1001 fprintf(stderr, "var %s:", PyString_AS_STRING(key));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1002 if (flags & DEF_GLOBAL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1003 fprintf(stderr, " declared_global");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1004 if (flags & DEF_LOCAL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1005 fprintf(stderr, " local");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1006 if (flags & DEF_PARAM)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1007 fprintf(stderr, " param");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1008 if (flags & DEF_STAR)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1009 fprintf(stderr, " stararg");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1010 if (flags & DEF_DOUBLESTAR)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1011 fprintf(stderr, " starstar");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1012 if (flags & DEF_INTUPLE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1013 fprintf(stderr, " tuple");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1014 if (flags & DEF_FREE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1015 fprintf(stderr, " free");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1016 if (flags & DEF_FREE_GLOBAL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1017 fprintf(stderr, " global");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1018 if (flags & DEF_FREE_CLASS)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1019 fprintf(stderr, " free/class");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1020 if (flags & DEF_IMPORT)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1021 fprintf(stderr, " import");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1022 fprintf(stderr, "\n");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1023 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1024 fprintf(stderr, "\n");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1025 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1026 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1027
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1028 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1029 compiler_unit_check(struct compiler_unit *u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1030 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1031 basicblock *block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1032 for (block = u->u_blocks; block != NULL; block = block->b_list) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1033 assert(block != (void *)0xcbcbcbcb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1034 assert(block != (void *)0xfbfbfbfb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1035 assert(block != (void *)0xdbdbdbdb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1036 if (block->b_instr != NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1037 assert(block->b_ialloc > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1038 assert(block->b_iused > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1039 assert(block->b_ialloc >= block->b_iused);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1040 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1041 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1042 assert (block->b_iused == 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1043 assert (block->b_ialloc == 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1044 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1045 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1046 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1047
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1048 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1049 compiler_unit_free(struct compiler_unit *u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1050 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1051 basicblock b, next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1052
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1053 compiler_unit_check(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1054 b = u->u_blocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1055 while (b != NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1056 if (b->b_instr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1057 PyObject_Free((void *)b->b_instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1058 next = b->b_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1059 PyObject_Free((void *)b);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1060 b = next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1061 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1062 Py_XDECREF(u->u_ste);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1063 Py_XDECREF(u->u_name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1064 Py_XDECREF(u->u_consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1065 Py_XDECREF(u->u_names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1066 Py_XDECREF(u->u_varnames);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1067 Py_XDECREF(u->u_freevars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1068 Py_XDECREF(u->u_cellvars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1069 Py_XDECREF(u->u_private);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1070 PyObject_Free(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1071 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1072
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1073 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1074 compiler_enter_scope(struct compiler c, identifier name, void key,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1075 int lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1076 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1077 struct compiler_unit *u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1078
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1079 u = PyObject_Malloc(sizeof(struct compiler_unit));
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1080 if (!u) {
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1081 PyErr_NoMemory();
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1082 return 0;
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1083 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1084 memset(u, 0, sizeof(struct compiler_unit));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1085 u->u_argcount = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1086 u->u_ste = PySymtable_Lookup(c->c_st, key);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1087 if (!u->u_ste) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1088 compiler_unit_free(u);
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1089 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1090 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1091 Py_INCREF(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1092 u->u_name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1093 u->u_varnames = list2dict(u->u_ste->ste_varnames);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1094 u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1095 u->u_freevars = dictbytype(u->u_ste->ste_symbols, FREE, DEF_FREE_CLASS,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1096 PyDict_Size(u->u_cellvars));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1097
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1098 u->u_blocks = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1099 u->u_tmpname = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1100 u->u_nfblocks = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1101 u->u_firstlineno = lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1102 u->u_lineno = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1103 u->u_lineno_set = false;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1104 u->u_consts = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1105 if (!u->u_consts) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1106 compiler_unit_free(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1107 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1108 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1109 u->u_names = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1110 if (!u->u_names) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1111 compiler_unit_free(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1112 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1113 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1114
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1115 u->u_private = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1116
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1117 /* Push the old compiler_unit on the stack. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1118 if (c->u) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1119 PyObject *wrapper = PyCObject_FromVoidPtr(c->u, NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1120 if (PyList_Append(c->c_stack, wrapper) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1121 compiler_unit_free(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1122 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1123 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1124 Py_DECREF(wrapper);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1125 u->u_private = c->u->u_private;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1126 Py_XINCREF(u->u_private);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1127 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1128 c->u = u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1129
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1130 c->c_nestlevel++;
36173 ade46371f04b Adjust usage of compiler_use_new_block to its return type. Martin v. Löwis <martin@v.loewis.de> parents: 36084 diff changeset	1131 if (compiler_use_new_block(c) == NULL)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1132 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1133
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1134 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1135 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1136
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1137 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1138 compiler_exit_scope(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1139 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1140 int n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1141 PyObject *wrapper;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1142
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1143 c->c_nestlevel--;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1144 compiler_unit_free(c->u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1145 /* Restore c->u to the parent unit. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1146 n = PyList_GET_SIZE(c->c_stack) - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1147 if (n >= 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1148 wrapper = PyList_GET_ITEM(c->c_stack, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1149 c->u = (struct compiler_unit *)PyCObject_AsVoidPtr(wrapper);
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1150 /* we are deleting from a list so this really shouldn't fail */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1151 if (PySequence_DelItem(c->c_stack, n) < 0)
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1152 Py_FatalError("compiler_exit_scope()");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1153 compiler_unit_check(c->u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1154 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1155 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1156 c->u = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1157
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1158 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1159
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1160 /* Allocate a new block and return a pointer to it.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1161 Returns NULL on error.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1162 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1163
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1164 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1165 compiler_new_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1166 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1167 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1168 struct compiler_unit *u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1169
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1170 u = c->u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1171 b = (basicblock *)PyObject_Malloc(sizeof(basicblock));
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1172 if (b == NULL) {
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1173 PyErr_NoMemory();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1174 return NULL;
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1175 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1176 memset((void *)b, 0, sizeof(basicblock));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1177 assert (b->b_next == NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1178 b->b_list = u->u_blocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1179 u->u_blocks = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1180 return b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1181 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1182
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1183 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1184 compiler_use_new_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1185 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1186 basicblock *block = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1187 if (block == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1188 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1189 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1190 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1191 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1192
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1193 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1194 compiler_next_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1195 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1196 basicblock *block = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1197 if (block == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1198 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1199 c->u->u_curblock->b_next = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1200 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1201 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1202 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1203
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1204 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1205 compiler_use_next_block(struct compiler c, basicblock block)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1206 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1207 assert(block != NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1208 c->u->u_curblock->b_next = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1209 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1210 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1211 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1212
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1213 /* Returns the offset of the next instruction in the current block's
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1214 b_instr array. Resizes the b_instr as necessary.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1215 Returns -1 on failure.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1216 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1217
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1218 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1219 compiler_next_instr(struct compiler c, basicblock b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1220 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1221 assert(b != NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1222 if (b->b_instr == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1223 b->b_instr = PyObject_Malloc(sizeof(struct instr) *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1224 DEFAULT_BLOCK_SIZE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1225 if (b->b_instr == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1226 PyErr_NoMemory();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1227 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1228 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1229 b->b_ialloc = DEFAULT_BLOCK_SIZE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1230 memset((char *)b->b_instr, 0,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1231 sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1232 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1233 else if (b->b_iused == b->b_ialloc) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1234 size_t oldsize, newsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1235 oldsize = b->b_ialloc * sizeof(struct instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1236 newsize = oldsize << 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1237 if (newsize == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1238 PyErr_NoMemory();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1239 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1240 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1241 b->b_ialloc <<= 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1242 b->b_instr = PyObject_Realloc((void *)b->b_instr, newsize);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1243 if (b->b_instr == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1244 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1245 memset((char *)b->b_instr + oldsize, 0, newsize - oldsize);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1246 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1247 return b->b_iused++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1248 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1249
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1250 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1251 compiler_set_lineno(struct compiler *c, int off)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1252 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1253 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1254 if (c->u->u_lineno_set)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1255 return;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1256 c->u->u_lineno_set = true;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1257 b = c->u->u_curblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1258 b->b_instr[off].i_lineno = c->u->u_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1259 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1260
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1261 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1262 opcode_stack_effect(int opcode, int oparg)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1263 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1264 switch (opcode) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1265 case POP_TOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1266 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1267 case ROT_TWO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1268 case ROT_THREE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1269 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1270 case DUP_TOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1271 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1272 case ROT_FOUR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1273 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1274
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1275 case UNARY_POSITIVE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1276 case UNARY_NEGATIVE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1277 case UNARY_NOT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1278 case UNARY_CONVERT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1279 case UNARY_INVERT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1280 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1281
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1282 case BINARY_POWER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1283 case BINARY_MULTIPLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1284 case BINARY_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1285 case BINARY_MODULO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1286 case BINARY_ADD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1287 case BINARY_SUBTRACT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1288 case BINARY_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1289 case BINARY_FLOOR_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1290 case BINARY_TRUE_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1291 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1292 case INPLACE_FLOOR_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1293 case INPLACE_TRUE_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1294 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1295
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1296 case SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1297 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1298 case SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1299 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1300 case SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1301 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1302 case SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1303 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1304
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1305 case STORE_SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1306 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1307 case STORE_SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1308 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1309 case STORE_SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1310 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1311 case STORE_SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1312 return -4;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1313
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1314 case DELETE_SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1315 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1316 case DELETE_SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1317 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1318 case DELETE_SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1319 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1320 case DELETE_SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1321 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1322
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1323 case INPLACE_ADD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1324 case INPLACE_SUBTRACT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1325 case INPLACE_MULTIPLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1326 case INPLACE_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1327 case INPLACE_MODULO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1328 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1329 case STORE_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1330 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1331 case DELETE_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1332 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1333
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1334 case BINARY_LSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1335 case BINARY_RSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1336 case BINARY_AND:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1337 case BINARY_XOR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1338 case BINARY_OR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1339 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1340 case INPLACE_POWER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1341 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1342 case GET_ITER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1343 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1344
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1345 case PRINT_EXPR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1346 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1347 case PRINT_ITEM:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1348 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1349 case PRINT_NEWLINE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1350 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1351 case PRINT_ITEM_TO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1352 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1353 case PRINT_NEWLINE_TO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1354 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1355 case INPLACE_LSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1356 case INPLACE_RSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1357 case INPLACE_AND:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1358 case INPLACE_XOR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1359 case INPLACE_OR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1360 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1361 case BREAK_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1362 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1363
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1364 case LOAD_LOCALS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1365 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1366 case RETURN_VALUE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1367 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1368 case IMPORT_STAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1369 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1370 case EXEC_STMT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1371 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1372 case YIELD_VALUE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1373 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1374
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1375 case POP_BLOCK:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1376 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1377 case END_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1378 return -1; /* or -2 or -3 if exception occurred */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1379 case BUILD_CLASS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1380 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1381
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1382 case STORE_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1383 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1384 case DELETE_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1385 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1386 case UNPACK_SEQUENCE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1387 return oparg-1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1388 case FOR_ITER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1389 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1390
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1391 case STORE_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1392 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1393 case DELETE_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1394 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1395 case STORE_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1396 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1397 case DELETE_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1398 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1399 case DUP_TOPX:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1400 return oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1401 case LOAD_CONST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1402 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1403 case LOAD_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1404 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1405 case BUILD_TUPLE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1406 case BUILD_LIST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1407 return 1-oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1408 case BUILD_MAP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1409 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1410 case LOAD_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1411 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1412 case COMPARE_OP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1413 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1414 case IMPORT_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1415 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1416 case IMPORT_FROM:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1417 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1418
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1419 case JUMP_FORWARD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1420 case JUMP_IF_FALSE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1421 case JUMP_IF_TRUE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1422 case JUMP_ABSOLUTE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1423 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1424
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1425 case LOAD_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1426 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1427
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1428 case CONTINUE_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1429 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1430 case SETUP_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1431 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1432 case SETUP_EXCEPT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1433 case SETUP_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1434 return 3; /* actually pushed by an exception */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1435
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1436 case LOAD_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1437 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1438 case STORE_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1439 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1440 case DELETE_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1441 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1442
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1443 case RAISE_VARARGS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1444 return -oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1445 #define NARGS(o) (((o) % 256) + 2*((o) / 256))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1446 case CALL_FUNCTION:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1447 return -NARGS(oparg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1448 case CALL_FUNCTION_VAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1449 case CALL_FUNCTION_KW:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1450 return -NARGS(oparg)-1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1451 case CALL_FUNCTION_VAR_KW:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1452 return -NARGS(oparg)-2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1453 #undef NARGS
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1454 case MAKE_FUNCTION:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1455 return -oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1456 case BUILD_SLICE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1457 if (oparg == 3)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1458 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1459 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1460 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1461
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1462 case MAKE_CLOSURE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1463 return -oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1464 case LOAD_CLOSURE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1465 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1466 case LOAD_DEREF:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1467 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1468 case STORE_DEREF:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1469 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1470 default:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1471 fprintf(stderr, "opcode = %d\n", opcode);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1472 Py_FatalError("opcode_stack_effect()");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1473
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1474 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1475 return 0; /* not reachable */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1476 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1477
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1478 /* Add an opcode with no argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1479 Returns 0 on failure, 1 on success.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1480 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1481
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1482 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1483 compiler_addop(struct compiler *c, int opcode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1484 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1485 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1486 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1487 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1488 off = compiler_next_instr(c, c->u->u_curblock);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1489 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1490 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1491 b = c->u->u_curblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1492 i = &b->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1493 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1494 i->i_hasarg = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1495 if (opcode == RETURN_VALUE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1496 b->b_return = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1497 compiler_set_lineno(c, off);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1498 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1499 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1500
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1501 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1502 compiler_add_o(struct compiler c, PyObject dict, PyObject *o)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1503 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1504 PyObject t, v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	1505 Py_ssize_t arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1506
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1507 /* necessary to make sure types aren't coerced (e.g., int and long) */
35778 95d0a857ae51 Use PyTuple_Pack instead of Py_BuildValue. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35773 diff changeset	1508 t = PyTuple_Pack(2, o, o->ob_type);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1509 if (t == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1510 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1511
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1512 v = PyDict_GetItem(dict, t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1513 if (!v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1514 arg = PyDict_Size(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1515 v = PyInt_FromLong(arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1516 if (!v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1517 Py_DECREF(t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1518 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1519 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1520 if (PyDict_SetItem(dict, t, v) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1521 Py_DECREF(t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1522 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1523 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1524 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1525 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1526 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1527 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1528 arg = PyInt_AsLong(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1529 Py_DECREF(t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1530 return arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1531 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1532
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1533 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1534 compiler_addop_o(struct compiler c, int opcode, PyObject dict,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1535 PyObject *o)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1536 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1537 int arg = compiler_add_o(c, dict, o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1538 if (arg < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1539 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1540 return compiler_addop_i(c, opcode, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1541 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1542
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1543 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1544 compiler_addop_name(struct compiler c, int opcode, PyObject dict,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1545 PyObject *o)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1546 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1547 int arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1548 PyObject *mangled = _Py_Mangle(c->u->u_private, o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1549 if (!mangled)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1550 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1551 arg = compiler_add_o(c, dict, mangled);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1552 Py_DECREF(mangled);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1553 if (arg < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1554 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1555 return compiler_addop_i(c, opcode, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1556 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1557
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1558 /* Add an opcode with an integer argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1559 Returns 0 on failure, 1 on success.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1560 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1561
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1562 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1563 compiler_addop_i(struct compiler *c, int opcode, int oparg)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1564 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1565 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1566 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1567 off = compiler_next_instr(c, c->u->u_curblock);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1568 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1569 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1570 i = &c->u->u_curblock->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1571 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1572 i->i_oparg = oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1573 i->i_hasarg = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1574 compiler_set_lineno(c, off);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1575 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1576 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1577
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1578 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1579 compiler_addop_j(struct compiler c, int opcode, basicblock b, int absolute)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1580 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1581 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1582 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1583
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1584 assert(b != NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1585 off = compiler_next_instr(c, c->u->u_curblock);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1586 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1587 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1588 compiler_set_lineno(c, off);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1589 i = &c->u->u_curblock->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1590 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1591 i->i_target = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1592 i->i_hasarg = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1593 if (absolute)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1594 i->i_jabs = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1595 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1596 i->i_jrel = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1597 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1598 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1599
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1600 /* The distinction between NEW_BLOCK and NEXT_BLOCK is subtle. (I'd
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1601 like to find better names.) NEW_BLOCK() creates a new block and sets
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1602 it as the current block. NEXT_BLOCK() also creates an implicit jump
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1603 from the current block to the new block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1604 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1605
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1606 /* XXX The returns inside these macros make it impossible to decref
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1607 objects created in the local function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1608 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1609
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1610
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1611 #define NEW_BLOCK(C) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1612 if (compiler_use_new_block((C)) == NULL) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1613 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1614 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1615
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1616 #define NEXT_BLOCK(C) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1617 if (compiler_next_block((C)) == NULL) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1618 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1619 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1620
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1621 #define ADDOP(C, OP) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1622 if (!compiler_addop((C), (OP))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1623 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1624 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1625
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1626 #define ADDOP_IN_SCOPE(C, OP) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1627 if (!compiler_addop((C), (OP))) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1628 compiler_exit_scope(c); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1629 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1630 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1631 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1632
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1633 #define ADDOP_O(C, OP, O, TYPE) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1634 if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1635 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1636 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1637
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1638 #define ADDOP_NAME(C, OP, O, TYPE) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1639 if (!compiler_addop_name((C), (OP), (C)->u->u_ ## TYPE, (O))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1640 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1641 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1642
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1643 #define ADDOP_I(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1644 if (!compiler_addop_i((C), (OP), (O))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1645 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1646 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1647
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1648 #define ADDOP_JABS(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1649 if (!compiler_addop_j((C), (OP), (O), 1)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1650 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1651 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1652
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1653 #define ADDOP_JREL(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1654 if (!compiler_addop_j((C), (OP), (O), 0)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1655 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1656 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1657
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1658 /* VISIT and VISIT_SEQ takes an ASDL type as their second argument. They use
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1659 the ASDL name to synthesize the name of the C type and the visit function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1660 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1661
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1662 #define VISIT(C, TYPE, V) {\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1663 if (!compiler_visit_ ## TYPE((C), (V))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1664 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1665 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1666
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1667 #define VISIT_IN_SCOPE(C, TYPE, V) {\
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1668 if (!compiler_visit_ ## TYPE((C), (V))) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1669 compiler_exit_scope(c); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1670 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1671 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1672 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1673
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1674 #define VISIT_SLICE(C, V, CTX) {\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1675 if (!compiler_visit_slice((C), (V), (CTX))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1676 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1677 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1678
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1679 #define VISIT_SEQ(C, TYPE, SEQ) { \
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	1680 int _i; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1681 asdl_seq seq = (SEQ); / avoid variable capture */ \
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	1682 for (_i = 0; _i < asdl_seq_LEN(seq); _i++) { \
56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	1683 TYPE ## _ty elt = asdl_seq_GET(seq, _i); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1684 if (!compiler_visit_ ## TYPE((C), elt)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1685 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1686 } \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1687 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1688
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1689 #define VISIT_SEQ_IN_SCOPE(C, TYPE, SEQ) { \
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	1690 int _i; \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1691 asdl_seq seq = (SEQ); / avoid variable capture */ \
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	1692 for (_i = 0; _i < asdl_seq_LEN(seq); _i++) { \
56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	1693 TYPE ## _ty elt = asdl_seq_GET(seq, _i); \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1694 if (!compiler_visit_ ## TYPE((C), elt)) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1695 compiler_exit_scope(c); \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1696 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1697 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1698 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1699 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1700
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1701 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1702 compiler_isdocstring(stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1703 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1704 if (s->kind != Expr_kind)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1705 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1706 return s->v.Expr.value->kind == Str_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1707 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1708
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1709 /* Compile a sequence of statements, checking for a docstring. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1710
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1711 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1712 compiler_body(struct compiler c, asdl_seq stmts)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1713 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1714 int i = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1715 stmt_ty st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1716
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1717 if (!asdl_seq_LEN(stmts))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1718 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1719 st = asdl_seq_GET(stmts, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1720 if (compiler_isdocstring(st)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1721 i = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1722 VISIT(c, expr, st->v.Expr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1723 if (!compiler_nameop(c, __doc__, Store))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1724 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1725 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1726 for (; i < asdl_seq_LEN(stmts); i++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1727 VISIT(c, stmt, asdl_seq_GET(stmts, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1728 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1729 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1730
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1731 static PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1732 compiler_mod(struct compiler *c, mod_ty mod)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1733 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1734 PyCodeObject *co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1735 int addNone = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1736 static PyObject *module;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1737 if (!module) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1738 module = PyString_FromString("<module>");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1739 if (!module)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1740 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1741 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1742 if (!compiler_enter_scope(c, module, mod, 1))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1743 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1744 switch (mod->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1745 case Module_kind:
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1746 if (!compiler_body(c, mod->v.Module.body)) {
3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1747 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1748 return 0;
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1749 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1750 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1751 case Interactive_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1752 c->c_interactive = 1;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1753 VISIT_SEQ_IN_SCOPE(c, stmt, mod->v.Interactive.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1754 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1755 case Expression_kind:
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1756 VISIT_IN_SCOPE(c, expr, mod->v.Expression.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1757 addNone = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1758 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1759 case Suite_kind:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1760 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1761 "suite should not be possible");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1762 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1763 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1764 PyErr_Format(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1765 "module kind %d should not be possible",
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1766 mod->kind);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1767 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1768 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1769 co = assemble(c, addNone);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1770 compiler_exit_scope(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1771 return co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1772 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1773
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1774 /* The test for LOCAL must come before the test for FREE in order to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1775 handle classes where name is both local and free. The local var is
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1776 a method and the free var is a free var referenced within a method.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1777 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1778
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1779 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1780 get_ref_type(struct compiler c, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1781 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1782 int scope = PyST_GetScope(c->u->u_ste, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1783 if (scope == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1784 char buf[350];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1785 PyOS_snprintf(buf, sizeof(buf),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1786 "unknown scope for %.100s in %.100s(%s) in %s\n"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1787 "symbols: %s\nlocals: %s\nglobals: %s\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1788 PyString_AS_STRING(name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1789 PyString_AS_STRING(c->u->u_name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1790 PyObject_REPR(c->u->u_ste->ste_id),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1791 c->c_filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1792 PyObject_REPR(c->u->u_ste->ste_symbols),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1793 PyObject_REPR(c->u->u_varnames),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1794 PyObject_REPR(c->u->u_names)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1795 );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1796 Py_FatalError(buf);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1797 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1798
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1799 return scope;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1800 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1801
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1802 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1803 compiler_lookup_arg(PyObject dict, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1804 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1805 PyObject k, v;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1806 k = Py_BuildValue("(OO)", name, name->ob_type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1807 if (k == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1808 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1809 v = PyDict_GetItem(dict, k);
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 35895 diff changeset	1810 Py_DECREF(k);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1811 if (v == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1812 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1813 return PyInt_AS_LONG(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1814 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1815
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1816 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1817 compiler_make_closure(struct compiler c, PyCodeObject co, int args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1818 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1819 int i, free = PyCode_GetNumFree(co);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1820 if (free == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1821 ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1822 ADDOP_I(c, MAKE_FUNCTION, args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1823 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1824 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1825 for (i = 0; i < free; ++i) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1826 /* Bypass com_addop_varname because it will generate
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1827 LOAD_DEREF but LOAD_CLOSURE is needed.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1828 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1829 PyObject *name = PyTuple_GET_ITEM(co->co_freevars, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1830 int arg, reftype;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1831
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1832 /* Special case: If a class contains a method with a
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1833 free variable that has the same name as a method,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1834 the name will be considered free and local in the
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1835 class. It should be handled by the closure, as
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1836 well as by the normal name loookup logic.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1837 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1838 reftype = get_ref_type(c, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1839 if (reftype == CELL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1840 arg = compiler_lookup_arg(c->u->u_cellvars, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1841 else /* (reftype == FREE) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1842 arg = compiler_lookup_arg(c->u->u_freevars, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1843 if (arg == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1844 printf("lookup %s in %s %d %d\n"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1845 "freevars of %s: %s\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1846 PyObject_REPR(name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1847 PyString_AS_STRING(c->u->u_name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1848 reftype, arg,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1849 PyString_AS_STRING(co->co_name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1850 PyObject_REPR(co->co_freevars));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1851 Py_FatalError("compiler_make_closure()");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1852 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1853 ADDOP_I(c, LOAD_CLOSURE, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1854 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1855 ADDOP_I(c, BUILD_TUPLE, free);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1856 ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1857 ADDOP_I(c, MAKE_CLOSURE, args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1858 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1859 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1860
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1861 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1862 compiler_decorators(struct compiler c, asdl_seq decos)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1863 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1864 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1865
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1866 if (!decos)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1867 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1868
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1869 for (i = 0; i < asdl_seq_LEN(decos); i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1870 VISIT(c, expr, asdl_seq_GET(decos, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1871 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1872 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1873 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1874
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1875 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1876 compiler_arguments(struct compiler *c, arguments_ty args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1877 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1878 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1879 int n = asdl_seq_LEN(args->args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1880 /* Correctly handle nested argument lists */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1881 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1882 expr_ty arg = asdl_seq_GET(args->args, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1883 if (arg->kind == Tuple_kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1884 PyObject *id = PyString_FromFormat(".%d", i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1885 if (id == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1886 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1887 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1888 if (!compiler_nameop(c, id, Load)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1889 Py_DECREF(id);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1890 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1891 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1892 Py_DECREF(id);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1893 VISIT(c, expr, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1894 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1895 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1896 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1897 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1898
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1899 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1900 compiler_function(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1901 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1902 PyCodeObject *co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1903 PyObject *first_const = Py_None;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1904 arguments_ty args = s->v.FunctionDef.args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1905 asdl_seq* decos = s->v.FunctionDef.decorators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1906 stmt_ty st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1907 int i, n, docstring;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1908
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1909 assert(s->kind == FunctionDef_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1910
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1911 if (!compiler_decorators(c, decos))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1912 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1913 if (args->defaults)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1914 VISIT_SEQ(c, expr, args->defaults);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1915 if (!compiler_enter_scope(c, s->v.FunctionDef.name, (void *)s,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1916 s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1917 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1918
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1919 st = asdl_seq_GET(s->v.FunctionDef.body, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1920 docstring = compiler_isdocstring(st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1921 if (docstring)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1922 first_const = st->v.Expr.value->v.Str.s;
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1923 if (compiler_add_o(c, c->u->u_consts, first_const) < 0) {
3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1924 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1925 return 0;
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1926 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1927
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1928 /* unpack nested arguments */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1929 compiler_arguments(c, args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1930
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1931 c->u->u_argcount = asdl_seq_LEN(args->args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1932 n = asdl_seq_LEN(s->v.FunctionDef.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1933 /* if there was a docstring, we need to skip the first statement */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1934 for (i = docstring; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1935 stmt_ty s2 = asdl_seq_GET(s->v.FunctionDef.body, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1936 if (i == 0 && s2->kind == Expr_kind &&
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1937 s2->v.Expr.value->kind == Str_kind)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1938 continue;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1939 VISIT_IN_SCOPE(c, stmt, s2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1940 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1941 co = assemble(c, 1);
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1942 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1943 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1944 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1945
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1946 compiler_make_closure(c, co, asdl_seq_LEN(args->defaults));
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1947 Py_DECREF(co);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1948
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1949 for (i = 0; i < asdl_seq_LEN(decos); i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1950 ADDOP_I(c, CALL_FUNCTION, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1951 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1952
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1953 return compiler_nameop(c, s->v.FunctionDef.name, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1954 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1955
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1956 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1957 compiler_class(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1958 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1959 int n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1960 PyCodeObject *co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1961 PyObject *str;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1962 /* push class name on stack, needed by BUILD_CLASS */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1963 ADDOP_O(c, LOAD_CONST, s->v.ClassDef.name, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1964 /* push the tuple of base classes on the stack */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1965 n = asdl_seq_LEN(s->v.ClassDef.bases);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1966 if (n > 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1967 VISIT_SEQ(c, expr, s->v.ClassDef.bases);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1968 ADDOP_I(c, BUILD_TUPLE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1969 if (!compiler_enter_scope(c, s->v.ClassDef.name, (void *)s,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1970 s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1971 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1972 c->u->u_private = s->v.ClassDef.name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1973 Py_INCREF(c->u->u_private);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1974 str = PyString_InternFromString("__name__");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1975 if (!str \|\| !compiler_nameop(c, str, Load)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1976 Py_XDECREF(str);
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1977 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1978 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1979 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1980
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1981 Py_DECREF(str);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1982 str = PyString_InternFromString("__module__");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1983 if (!str \|\| !compiler_nameop(c, str, Store)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1984 Py_XDECREF(str);
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1985 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1986 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1987 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1988 Py_DECREF(str);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1989
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1990 if (!compiler_body(c, s->v.ClassDef.body)) {
3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1991 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1992 return 0;
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1993 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1994
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1995 ADDOP_IN_SCOPE(c, LOAD_LOCALS);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1996 ADDOP_IN_SCOPE(c, RETURN_VALUE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1997 co = assemble(c, 1);
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1998 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1999 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2000 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2001
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2002 compiler_make_closure(c, co, 0);
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2003 Py_DECREF(co);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2004
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2005 ADDOP_I(c, CALL_FUNCTION, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2006 ADDOP(c, BUILD_CLASS);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2007 if (!compiler_nameop(c, s->v.ClassDef.name, Store))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2008 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2009 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2010 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2011
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2012 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2013 compiler_lambda(struct compiler *c, expr_ty e)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2014 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2015 PyCodeObject *co;
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2016 static identifier name;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2017 arguments_ty args = e->v.Lambda.args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2018 assert(e->kind == Lambda_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2019
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2020 if (!name) {
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2021 name = PyString_InternFromString("<lambda>");
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2022 if (!name)
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2023 return 0;
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2024 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2025
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2026 if (args->defaults)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2027 VISIT_SEQ(c, expr, args->defaults);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2028 if (!compiler_enter_scope(c, name, (void *)e, e->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2029 return 0;
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2030
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2031 /* unpack nested arguments */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2032 compiler_arguments(c, args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2033
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2034 c->u->u_argcount = asdl_seq_LEN(args->args);
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	2035 VISIT_IN_SCOPE(c, expr, e->v.Lambda.body);
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	2036 ADDOP_IN_SCOPE(c, RETURN_VALUE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2037 co = assemble(c, 1);
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	2038 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2039 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2040 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2041
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2042 compiler_make_closure(c, co, asdl_seq_LEN(args->defaults));
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2043 Py_DECREF(co);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2044
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2045 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2046 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2047
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2048 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2049 compiler_print(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2050 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2051 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2052 bool dest;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2053
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2054 assert(s->kind == Print_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2055 n = asdl_seq_LEN(s->v.Print.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2056 dest = false;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2057 if (s->v.Print.dest) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2058 VISIT(c, expr, s->v.Print.dest);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2059 dest = true;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2060 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2061 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2062 expr_ty e = (expr_ty)asdl_seq_GET(s->v.Print.values, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2063 if (dest) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2064 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2065 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2066 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2067 ADDOP(c, PRINT_ITEM_TO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2068 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2069 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2070 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2071 ADDOP(c, PRINT_ITEM);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2072 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2073 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2074 if (s->v.Print.nl) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2075 if (dest)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2076 ADDOP(c, PRINT_NEWLINE_TO)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2077 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2078 ADDOP(c, PRINT_NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2079 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2080 else if (dest)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2081 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2082 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2083 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2084
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2085 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2086 compiler_if(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2087 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2088 basicblock end, next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2089
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2090 assert(s->kind == If_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2091 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2092 if (end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2093 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2094 next = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2095 if (next == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2096 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2097 VISIT(c, expr, s->v.If.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2098 ADDOP_JREL(c, JUMP_IF_FALSE, next);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2099 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2100 VISIT_SEQ(c, stmt, s->v.If.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2101 ADDOP_JREL(c, JUMP_FORWARD, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2102 compiler_use_next_block(c, next);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2103 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2104 if (s->v.If.orelse)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2105 VISIT_SEQ(c, stmt, s->v.If.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2106 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2107 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2108 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2109
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2110 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2111 compiler_for(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2112 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2113 basicblock start, cleanup, *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2114
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2115 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2116 cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2117 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2118 if (start == NULL \|\| end == NULL \|\| cleanup == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2119 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2120 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2121 if (!compiler_push_fblock(c, LOOP, start))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2122 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2123 VISIT(c, expr, s->v.For.iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2124 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2125 compiler_use_next_block(c, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2126 ADDOP_JREL(c, FOR_ITER, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2127 VISIT(c, expr, s->v.For.target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2128 VISIT_SEQ(c, stmt, s->v.For.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2129 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2130 compiler_use_next_block(c, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2131 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2132 compiler_pop_fblock(c, LOOP, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2133 VISIT_SEQ(c, stmt, s->v.For.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2134 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2135 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2136 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2137
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2138 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2139 compiler_while(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2140 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2141 basicblock loop, orelse, end, anchor = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2142 int constant = expr_constant(s->v.While.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2143
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2144 if (constant == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2145 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2146 loop = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2147 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2148 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2149 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2150 if (anchor == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2151 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2152 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2153 if (loop == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2154 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2155 if (s->v.While.orelse) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2156 orelse = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2157 if (orelse == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2158 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2159 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2160 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2161 orelse = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2162
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2163 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2164 compiler_use_next_block(c, loop);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2165 if (!compiler_push_fblock(c, LOOP, loop))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2166 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2167 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2168 VISIT(c, expr, s->v.While.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2169 ADDOP_JREL(c, JUMP_IF_FALSE, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2170 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2171 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2172 VISIT_SEQ(c, stmt, s->v.While.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2173 ADDOP_JABS(c, JUMP_ABSOLUTE, loop);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2174
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2175 /* XXX should the two POP instructions be in a separate block
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2176 if there is no else clause ?
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2177 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2178
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2179 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2180 compiler_use_next_block(c, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2181 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2182 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2183 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2184 compiler_pop_fblock(c, LOOP, loop);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2185 if (orelse != NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2186 VISIT_SEQ(c, stmt, s->v.While.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2187 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2188
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2189 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2190 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2191
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2192 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2193 compiler_continue(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2194 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2195 static const char LOOP_ERROR_MSG[] = "'continue' not properly in loop";
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2196 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2197
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2198 if (!c->u->u_nfblocks)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2199 return compiler_error(c, LOOP_ERROR_MSG);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2200 i = c->u->u_nfblocks - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2201 switch (c->u->u_fblock[i].fb_type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2202 case LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2203 ADDOP_JABS(c, JUMP_ABSOLUTE, c->u->u_fblock[i].fb_block);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2204 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2205 case EXCEPT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2206 case FINALLY_TRY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2207 while (--i >= 0 && c->u->u_fblock[i].fb_type != LOOP)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2208 ;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2209 if (i == -1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2210 return compiler_error(c, LOOP_ERROR_MSG);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2211 ADDOP_JABS(c, CONTINUE_LOOP, c->u->u_fblock[i].fb_block);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2212 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2213 case FINALLY_END:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2214 return compiler_error(c,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2215 "'continue' not supported inside 'finally' clause");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2216 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2217
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2218 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2219 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2220
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2221 /* Code generated for "try: <body> finally: <finalbody>" is as follows:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2222
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2223 SETUP_FINALLY L
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2224 <code for body>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2225 POP_BLOCK
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2226 LOAD_CONST <None>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2227 L: <code for finalbody>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2228 END_FINALLY
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2229
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2230 The special instructions use the block stack. Each block
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2231 stack entry contains the instruction that created it (here
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2232 SETUP_FINALLY), the level of the value stack at the time the
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2233 block stack entry was created, and a label (here L).
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2234
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2235 SETUP_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2236 Pushes the current value stack level and the label
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2237 onto the block stack.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2238 POP_BLOCK:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2239 Pops en entry from the block stack, and pops the value
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2240 stack until its level is the same as indicated on the
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2241 block stack. (The label is ignored.)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2242 END_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2243 Pops a variable number of entries from the value stack
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2244 and re-raises the exception they specify. The number of
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2245 entries popped depends on the (pseudo) exception type.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2246
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2247 The block stack is unwound when an exception is raised:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2248 when a SETUP_FINALLY entry is found, the exception is pushed
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2249 onto the value stack (and the exception condition is cleared),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2250 and the interpreter jumps to the label gotten from the block
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2251 stack.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2252 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2253
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2254 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2255 compiler_try_finally(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2256 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2257 basicblock body, end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2258 body = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2259 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2260 if (body == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2261 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2262
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2263 ADDOP_JREL(c, SETUP_FINALLY, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2264 compiler_use_next_block(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2265 if (!compiler_push_fblock(c, FINALLY_TRY, body))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2266 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2267 VISIT_SEQ(c, stmt, s->v.TryFinally.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2268 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2269 compiler_pop_fblock(c, FINALLY_TRY, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2270
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2271 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2272 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2273 if (!compiler_push_fblock(c, FINALLY_END, end))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2274 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2275 VISIT_SEQ(c, stmt, s->v.TryFinally.finalbody);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2276 ADDOP(c, END_FINALLY);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2277 compiler_pop_fblock(c, FINALLY_END, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2278
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2279 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2280 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2281
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2282 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2283 Code generated for "try: S except E1, V1: S1 except E2, V2: S2 ...":
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2284 (The contents of the value stack is shown in [], with the top
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2285 at the right; 'tb' is trace-back info, 'val' the exception's
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2286 associated value, and 'exc' the exception.)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2287
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2288 Value stack Label Instruction Argument
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2289 [] SETUP_EXCEPT L1
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2290 [] <code for S>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2291 [] POP_BLOCK
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2292 [] JUMP_FORWARD L0
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2293
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2294 [tb, val, exc] L1: DUP )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2295 [tb, val, exc, exc] <evaluate E1> )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2296 [tb, val, exc, exc, E1] COMPARE_OP EXC_MATCH ) only if E1
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2297 [tb, val, exc, 1-or-0] JUMP_IF_FALSE L2 )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2298 [tb, val, exc, 1] POP )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2299 [tb, val, exc] POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2300 [tb, val] <assign to V1> (or POP if no V1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2301 [tb] POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2302 [] <code for S1>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2303 JUMP_FORWARD L0
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2304
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2305 [tb, val, exc, 0] L2: POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2306 [tb, val, exc] DUP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2307 .............................etc.......................
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2308
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2309 [tb, val, exc, 0] Ln+1: POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2310 [tb, val, exc] END_FINALLY # re-raise exception
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2311
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2312 [] L0: <next statement>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2313
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2314 Of course, parts are not generated if Vi or Ei is not present.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2315 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2316 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2317 compiler_try_except(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2318 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2319 basicblock body, orelse, except, end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2320 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2321
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2322 body = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2323 except = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2324 orelse = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2325 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2326 if (body == NULL \|\| except == NULL \|\| orelse == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2327 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2328 ADDOP_JREL(c, SETUP_EXCEPT, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2329 compiler_use_next_block(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2330 if (!compiler_push_fblock(c, EXCEPT, body))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2331 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2332 VISIT_SEQ(c, stmt, s->v.TryExcept.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2333 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2334 compiler_pop_fblock(c, EXCEPT, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2335 ADDOP_JREL(c, JUMP_FORWARD, orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2336 n = asdl_seq_LEN(s->v.TryExcept.handlers);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2337 compiler_use_next_block(c, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2338 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2339 excepthandler_ty handler = asdl_seq_GET(
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2340 s->v.TryExcept.handlers, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2341 if (!handler->type && i < n-1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2342 return compiler_error(c, "default 'except:' must be last");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2343 except = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2344 if (except == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2345 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2346 if (handler->type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2347 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2348 VISIT(c, expr, handler->type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2349 ADDOP_I(c, COMPARE_OP, PyCmp_EXC_MATCH);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2350 ADDOP_JREL(c, JUMP_IF_FALSE, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2351 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2352 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2353 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2354 if (handler->name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2355 VISIT(c, expr, handler->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2356 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2357 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2358 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2359 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2360 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2361 VISIT_SEQ(c, stmt, handler->body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2362 ADDOP_JREL(c, JUMP_FORWARD, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2363 compiler_use_next_block(c, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2364 if (handler->type)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2365 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2366 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2367 ADDOP(c, END_FINALLY);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2368 compiler_use_next_block(c, orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2369 VISIT_SEQ(c, stmt, s->v.TryExcept.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2370 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2371 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2372 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2373
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2374 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2375 compiler_import_as(struct compiler *c, identifier name, identifier asname)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2376 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2377 /* The IMPORT_NAME opcode was already generated. This function
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2378 merely needs to bind the result to a name.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2379
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2380 If there is a dot in name, we need to split it and emit a
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2381 LOAD_ATTR for each name.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2382 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2383 const char *src = PyString_AS_STRING(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2384 const char *dot = strchr(src, '.');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2385 if (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2386 /* Consume the base module name to get the first attribute */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2387 src = dot + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2388 while (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2389 /* NB src is only defined when dot != NULL */
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	2390 PyObject *attr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2391 dot = strchr(src, '.');
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	2392 attr = PyString_FromStringAndSize(src,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2393 dot ? dot - src : strlen(src));
35895 fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2394 if (!attr)
fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2395 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2396 ADDOP_O(c, LOAD_ATTR, attr, names);
35895 fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2397 Py_DECREF(attr);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2398 src = dot + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2399 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2400 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2401 return compiler_nameop(c, asname, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2402 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2403
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2404 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2405 compiler_import(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2406 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2407 /* The Import node stores a module name like a.b.c as a single
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2408 string. This is convenient for all cases except
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2409 import a.b.c as d
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2410 where we need to parse that string to extract the individual
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2411 module names.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2412 XXX Perhaps change the representation to make this case simpler?
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2413 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2414 int i, n = asdl_seq_LEN(s->v.Import.names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2415 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2416 alias_ty alias = asdl_seq_GET(s->v.Import.names, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2417 int r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2418
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2419 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2420 ADDOP_NAME(c, IMPORT_NAME, alias->name, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2421
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2422 if (alias->asname) {
35772 f64fb284ed15 Don't stop generating code for import statements after the first "import as" Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35767 diff changeset	2423 r = compiler_import_as(c, alias->name, alias->asname);
f64fb284ed15 Don't stop generating code for import statements after the first "import as" Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35767 diff changeset	2424 if (!r)
f64fb284ed15 Don't stop generating code for import statements after the first "import as" Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35767 diff changeset	2425 return r;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2426 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2427 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2428 identifier tmp = alias->name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2429 const char *base = PyString_AS_STRING(alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2430 char *dot = strchr(base, '.');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2431 if (dot)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2432 tmp = PyString_FromStringAndSize(base,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2433 dot - base);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2434 r = compiler_nameop(c, tmp, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2435 if (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2436 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2437 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2438 if (!r)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2439 return r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2440 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2441 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2442 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2443 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2444
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2445 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2446 compiler_from_import(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2447 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2448 int i, n = asdl_seq_LEN(s->v.ImportFrom.names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2449
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2450 PyObject *names = PyTuple_New(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2451 if (!names)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2452 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2453
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2454 /* build up the names */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2455 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2456 alias_ty alias = asdl_seq_GET(s->v.ImportFrom.names, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2457 Py_INCREF(alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2458 PyTuple_SET_ITEM(names, i, alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2459 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2460
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2461 if (s->lineno > c->c_future->ff_lineno) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2462 if (!strcmp(PyString_AS_STRING(s->v.ImportFrom.module),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2463 "__future__")) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2464 Py_DECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2465 return compiler_error(c,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2466 "from __future__ imports must occur "
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2467 "at the beginning of the file");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2468
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2469 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2470 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2471
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2472 ADDOP_O(c, LOAD_CONST, names, consts);
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 35895 diff changeset	2473 Py_DECREF(names);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2474 ADDOP_NAME(c, IMPORT_NAME, s->v.ImportFrom.module, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2475 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2476 alias_ty alias = asdl_seq_GET(s->v.ImportFrom.names, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2477 identifier store_name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2478
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2479 if (i == 0 && PyString_AS_STRING(alias->name) == '') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2480 assert(n == 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2481 ADDOP(c, IMPORT_STAR);
35993 a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2482 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2483 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2484
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2485 ADDOP_NAME(c, IMPORT_FROM, alias->name, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2486 store_name = alias->name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2487 if (alias->asname)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2488 store_name = alias->asname;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2489
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2490 if (!compiler_nameop(c, store_name, Store)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2491 Py_DECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2492 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2493 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2494 }
35993 a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2495 /* remove imported module */
a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2496 ADDOP(c, POP_TOP);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2497 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2498 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2499
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2500 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2501 compiler_assert(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2502 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2503 static PyObject *assertion_error = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2504 basicblock *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2505
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2506 if (Py_OptimizeFlag)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2507 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2508 if (assertion_error == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2509 assertion_error = PyString_FromString("AssertionError");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2510 if (assertion_error == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2511 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2512 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2513 VISIT(c, expr, s->v.Assert.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2514 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2515 if (end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2516 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2517 ADDOP_JREL(c, JUMP_IF_TRUE, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2518 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2519 ADDOP_O(c, LOAD_GLOBAL, assertion_error, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2520 if (s->v.Assert.msg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2521 VISIT(c, expr, s->v.Assert.msg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2522 ADDOP_I(c, RAISE_VARARGS, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2523 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2524 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2525 ADDOP_I(c, RAISE_VARARGS, 1);
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9215 diff changeset	2526 }
36081 19d96c2d7df5 Fix Armin's bug 1333982. He found it, he didn't created it :-) Neal Norwitz <nnorwitz@gmail.com> parents: 36079 diff changeset	2527 compiler_use_next_block(c, end);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2528 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2529 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2530 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2531
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2532 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2533 compiler_visit_stmt(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2534 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2535 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2536
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2537 c->u->u_lineno = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2538 c->u->u_lineno_set = false;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2539 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2540 case FunctionDef_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2541 return compiler_function(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2542 case ClassDef_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2543 return compiler_class(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2544 case Return_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2545 if (c->u->u_ste->ste_type != FunctionBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2546 return compiler_error(c, "'return' outside function");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2547 if (s->v.Return.value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2548 if (c->u->u_ste->ste_generator) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2549 return compiler_error(c,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2550 "'return' with argument inside generator");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2551 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2552 VISIT(c, expr, s->v.Return.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2553 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2554 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2555 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2556 ADDOP(c, RETURN_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2557 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2558 case Delete_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2559 VISIT_SEQ(c, expr, s->v.Delete.targets)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2560 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2561 case Assign_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2562 n = asdl_seq_LEN(s->v.Assign.targets);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2563 VISIT(c, expr, s->v.Assign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2564 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2565 if (i < n - 1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2566 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2567 VISIT(c, expr,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2568 (expr_ty)asdl_seq_GET(s->v.Assign.targets, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2569 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2570 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2571 case AugAssign_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2572 return compiler_augassign(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2573 case Print_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2574 return compiler_print(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2575 case For_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2576 return compiler_for(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2577 case While_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2578 return compiler_while(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2579 case If_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2580 return compiler_if(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2581 case Raise_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2582 n = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2583 if (s->v.Raise.type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2584 VISIT(c, expr, s->v.Raise.type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2585 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2586 if (s->v.Raise.inst) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2587 VISIT(c, expr, s->v.Raise.inst);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2588 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2589 if (s->v.Raise.tback) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2590 VISIT(c, expr, s->v.Raise.tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2591 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2592 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2593 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2594 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2595 ADDOP_I(c, RAISE_VARARGS, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2596 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2597 case TryExcept_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2598 return compiler_try_except(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2599 case TryFinally_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2600 return compiler_try_finally(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2601 case Assert_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2602 return compiler_assert(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2603 case Import_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2604 return compiler_import(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2605 case ImportFrom_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2606 return compiler_from_import(c, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2607 case Exec_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2608 VISIT(c, expr, s->v.Exec.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2609 if (s->v.Exec.globals) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2610 VISIT(c, expr, s->v.Exec.globals);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2611 if (s->v.Exec.locals) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2612 VISIT(c, expr, s->v.Exec.locals);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2613 } else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2614 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2615 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2616 } else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2617 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2618 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2619 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2620 ADDOP(c, EXEC_STMT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2621 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2622 case Global_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2623 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2624 case Expr_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2625 VISIT(c, expr, s->v.Expr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2626 if (c->c_interactive && c->c_nestlevel <= 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2627 ADDOP(c, PRINT_EXPR);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2628 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2629 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2630 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2631 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2632 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2633 case Pass_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2634 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2635 case Break_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2636 if (!c->u->u_nfblocks)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2637 return compiler_error(c, "'break' outside loop");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2638 ADDOP(c, BREAK_LOOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2639 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2640 case Continue_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2641 return compiler_continue(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2642 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2643 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2644 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2645
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2646 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2647 unaryop(unaryop_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2648 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2649 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2650 case Invert:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2651 return UNARY_INVERT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2652 case Not:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2653 return UNARY_NOT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2654 case UAdd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2655 return UNARY_POSITIVE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2656 case USub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2657 return UNARY_NEGATIVE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2658 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2659 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2660 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2661
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2662 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2663 binop(struct compiler *c, operator_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2664 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2665 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2666 case Add:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2667 return BINARY_ADD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2668 case Sub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2669 return BINARY_SUBTRACT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2670 case Mult:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2671 return BINARY_MULTIPLY;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2672 case Div:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2673 if (c->c_flags && c->c_flags->cf_flags & CO_FUTURE_DIVISION)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2674 return BINARY_TRUE_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2675 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2676 return BINARY_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2677 case Mod:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2678 return BINARY_MODULO;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2679 case Pow:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2680 return BINARY_POWER;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2681 case LShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2682 return BINARY_LSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2683 case RShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2684 return BINARY_RSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2685 case BitOr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2686 return BINARY_OR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2687 case BitXor:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2688 return BINARY_XOR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2689 case BitAnd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2690 return BINARY_AND;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2691 case FloorDiv:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2692 return BINARY_FLOOR_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2693 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2694 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2695 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2696
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2697 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2698 cmpop(cmpop_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2699 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2700 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2701 case Eq:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2702 return PyCmp_EQ;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2703 case NotEq:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2704 return PyCmp_NE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2705 case Lt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2706 return PyCmp_LT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2707 case LtE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2708 return PyCmp_LE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2709 case Gt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2710 return PyCmp_GT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2711 case GtE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2712 return PyCmp_GE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2713 case Is:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2714 return PyCmp_IS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2715 case IsNot:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2716 return PyCmp_IS_NOT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2717 case In:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2718 return PyCmp_IN;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2719 case NotIn:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2720 return PyCmp_NOT_IN;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2721 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2722 return PyCmp_BAD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2723 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2724
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2725 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2726 inplace_binop(struct compiler *c, operator_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2727 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2728 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2729 case Add:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2730 return INPLACE_ADD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2731 case Sub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2732 return INPLACE_SUBTRACT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2733 case Mult:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2734 return INPLACE_MULTIPLY;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2735 case Div:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2736 if (c->c_flags && c->c_flags->cf_flags & CO_FUTURE_DIVISION)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2737 return INPLACE_TRUE_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2738 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2739 return INPLACE_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2740 case Mod:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2741 return INPLACE_MODULO;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2742 case Pow:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2743 return INPLACE_POWER;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2744 case LShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2745 return INPLACE_LSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2746 case RShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2747 return INPLACE_RSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2748 case BitOr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2749 return INPLACE_OR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2750 case BitXor:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2751 return INPLACE_XOR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2752 case BitAnd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2753 return INPLACE_AND;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2754 case FloorDiv:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2755 return INPLACE_FLOOR_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2756 }
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2757 PyErr_Format(PyExc_SystemError,
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2758 "inplace binary op %d should not be possible", op);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2759 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2760 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2761
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2762 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2763 compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2764 {
35781 31d36dd5959c Remove unnecessary local variable. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35779 diff changeset	2765 int op, scope, arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2766 enum { OP_FAST, OP_GLOBAL, OP_DEREF, OP_NAME } optype;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2767
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2768 PyObject *dict = c->u->u_names;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2769 PyObject *mangled;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2770 /* XXX AugStore isn't used anywhere! */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2771
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2772 /* First check for assignment to __debug__. Param? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2773 if ((ctx == Store \|\| ctx == AugStore \|\| ctx == Del)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2774 && !strcmp(PyString_AS_STRING(name), "__debug__")) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2775 return compiler_error(c, "can not assign to __debug__");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2776 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2777
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2778 mangled = _Py_Mangle(c->u->u_private, name);
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2779 if (!mangled)
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2780 return 0;
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2781
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2782 op = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2783 optype = OP_NAME;
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2784 scope = PyST_GetScope(c->u->u_ste, mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2785 switch (scope) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2786 case FREE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2787 dict = c->u->u_freevars;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2788 optype = OP_DEREF;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2789 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2790 case CELL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2791 dict = c->u->u_cellvars;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2792 optype = OP_DEREF;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2793 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2794 case LOCAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2795 if (c->u->u_ste->ste_type == FunctionBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2796 optype = OP_FAST;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2797 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2798 case GLOBAL_IMPLICIT:
35773 0aef351223da Fix arigo's funky LOAD_NAME bug: implicit globals inside classes have Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35772 diff changeset	2799 if (c->u->u_ste->ste_type == FunctionBlock &&
0aef351223da Fix arigo's funky LOAD_NAME bug: implicit globals inside classes have Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35772 diff changeset	2800 !c->u->u_ste->ste_unoptimized)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2801 optype = OP_GLOBAL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2802 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2803 case GLOBAL_EXPLICIT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2804 optype = OP_GLOBAL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2805 break;
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2806 default:
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2807 /* scope can be 0 */
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2808 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2809 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2810
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2811 /* XXX Leave assert here, but handle __doc__ and the like better */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2812 assert(scope \|\| PyString_AS_STRING(name)[0] == '_');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2813
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2814 switch (optype) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2815 case OP_DEREF:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2816 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2817 case Load: op = LOAD_DEREF; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2818 case Store: op = STORE_DEREF; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2819 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2820 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2821 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2822 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2823 PyErr_Format(PyExc_SyntaxError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2824 "can not delete variable '%s' referenced "
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2825 "in nested scope",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2826 PyString_AS_STRING(name));
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2827 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2828 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2829 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2830 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2831 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2832 "param invalid for deref variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2833 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2834 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2835 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2836 case OP_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2837 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2838 case Load: op = LOAD_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2839 case Store: op = STORE_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2840 case Del: op = DELETE_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2841 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2842 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2843 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2844 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2845 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2846 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2847 "param invalid for local variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2848 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2849 }
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2850 ADDOP_O(c, op, mangled, varnames);
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2851 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2852 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2853 case OP_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2854 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2855 case Load: op = LOAD_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2856 case Store: op = STORE_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2857 case Del: op = DELETE_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2858 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2859 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2860 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2861 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2862 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2863 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2864 "param invalid for global variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2865 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2866 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2867 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2868 case OP_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2869 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2870 case Load: op = LOAD_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2871 case Store: op = STORE_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2872 case Del: op = DELETE_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2873 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2874 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2875 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2876 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2877 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2878 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2879 "param invalid for name variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2880 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2881 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2882 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2883 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2884
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2885 assert(op);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2886 arg = compiler_add_o(c, dict, mangled);
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2887 Py_DECREF(mangled);
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2888 if (arg < 0)
19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2889 return 0;
35781 31d36dd5959c Remove unnecessary local variable. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35779 diff changeset	2890 return compiler_addop_i(c, op, arg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2891 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2892
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2893 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2894 compiler_boolop(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2895 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2896 basicblock *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2897 int jumpi, i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2898 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2899
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2900 assert(e->kind == BoolOp_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2901 if (e->v.BoolOp.op == And)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2902 jumpi = JUMP_IF_FALSE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2903 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2904 jumpi = JUMP_IF_TRUE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2905 end = compiler_new_block(c);
36173 ade46371f04b Adjust usage of compiler_use_new_block to its return type. Martin v. Löwis <martin@v.loewis.de> parents: 36084 diff changeset	2906 if (end == NULL)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2907 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2908 s = e->v.BoolOp.values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2909 n = asdl_seq_LEN(s) - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2910 for (i = 0; i < n; ++i) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2911 VISIT(c, expr, asdl_seq_GET(s, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2912 ADDOP_JREL(c, jumpi, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2913 ADDOP(c, POP_TOP)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2914 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2915 VISIT(c, expr, asdl_seq_GET(s, n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2916 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2917 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2918 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2919
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2920 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2921 compiler_list(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2922 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2923 int n = asdl_seq_LEN(e->v.List.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2924 if (e->v.List.ctx == Store) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2925 ADDOP_I(c, UNPACK_SEQUENCE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2926 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2927 VISIT_SEQ(c, expr, e->v.List.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2928 if (e->v.List.ctx == Load) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2929 ADDOP_I(c, BUILD_LIST, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2930 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2931 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2932 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2933
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2934 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2935 compiler_tuple(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2936 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2937 int n = asdl_seq_LEN(e->v.Tuple.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2938 if (e->v.Tuple.ctx == Store) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2939 ADDOP_I(c, UNPACK_SEQUENCE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2940 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2941 VISIT_SEQ(c, expr, e->v.Tuple.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2942 if (e->v.Tuple.ctx == Load) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2943 ADDOP_I(c, BUILD_TUPLE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2944 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2945 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2946 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2947
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2948 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2949 compiler_compare(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2950 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2951 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2952 basicblock *cleanup = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2953
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2954 /* XXX the logic can be cleaned up for 1 or multiple comparisons */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2955 VISIT(c, expr, e->v.Compare.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2956 n = asdl_seq_LEN(e->v.Compare.ops);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2957 assert(n > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2958 if (n > 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2959 cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2960 if (cleanup == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2961 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2962 VISIT(c, expr, asdl_seq_GET(e->v.Compare.comparators, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2963 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2964 for (i = 1; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2965 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2966 ADDOP(c, ROT_THREE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2967 /* XXX We're casting a void* to cmpop_ty in the next stmt. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2968 ADDOP_I(c, COMPARE_OP,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2969 cmpop((cmpop_ty)asdl_seq_GET(e->v.Compare.ops, i - 1)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2970 ADDOP_JREL(c, JUMP_IF_FALSE, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2971 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2972 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2973 if (i < (n - 1))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2974 VISIT(c, expr, asdl_seq_GET(e->v.Compare.comparators, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2975 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2976 VISIT(c, expr, asdl_seq_GET(e->v.Compare.comparators, n - 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2977 ADDOP_I(c, COMPARE_OP,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2978 /* XXX We're casting a void* to cmpop_ty in the next stmt. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2979 cmpop((cmpop_ty)asdl_seq_GET(e->v.Compare.ops, n - 1)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2980 if (n > 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2981 basicblock *end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2982 if (end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2983 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2984 ADDOP_JREL(c, JUMP_FORWARD, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2985 compiler_use_next_block(c, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2986 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2987 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2988 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2989 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2990 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2991 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2992
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2993 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2994 compiler_call(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2995 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2996 int n, code = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2997
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2998 VISIT(c, expr, e->v.Call.func);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2999 n = asdl_seq_LEN(e->v.Call.args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3000 VISIT_SEQ(c, expr, e->v.Call.args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3001 if (e->v.Call.keywords) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3002 VISIT_SEQ(c, keyword, e->v.Call.keywords);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3003 n \|= asdl_seq_LEN(e->v.Call.keywords) << 8;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3004 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3005 if (e->v.Call.starargs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3006 VISIT(c, expr, e->v.Call.starargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3007 code \|= 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3008 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3009 if (e->v.Call.kwargs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3010 VISIT(c, expr, e->v.Call.kwargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3011 code \|= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3012 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3013 switch (code) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3014 case 0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3015 ADDOP_I(c, CALL_FUNCTION, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3016 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3017 case 1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3018 ADDOP_I(c, CALL_FUNCTION_VAR, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3019 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3020 case 2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3021 ADDOP_I(c, CALL_FUNCTION_KW, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3022 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3023 case 3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3024 ADDOP_I(c, CALL_FUNCTION_VAR_KW, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3025 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3026 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3027 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3028 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3029
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3030 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3031 compiler_listcomp_generator(struct compiler c, PyObject tmpname,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3032 asdl_seq *generators, int gen_index,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3033 expr_ty elt)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3034 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3035 /* generate code for the iterator, then each of the ifs,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3036 and then write to the element */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3037
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3038 comprehension_ty l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3039 basicblock start, anchor, skip, if_cleanup;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3040 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3041
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3042 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3043 skip = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3044 if_cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3045 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3046
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3047 if (start == NULL \|\| skip == NULL \|\| if_cleanup == NULL \|\|
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3048 anchor == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3049 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3050
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3051 l = asdl_seq_GET(generators, gen_index);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3052 VISIT(c, expr, l->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3053 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3054 compiler_use_next_block(c, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3055 ADDOP_JREL(c, FOR_ITER, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3056 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3057 VISIT(c, expr, l->target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3058
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3059 /* XXX this needs to be cleaned up...a lot! */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3060 n = asdl_seq_LEN(l->ifs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3061 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3062 expr_ty e = asdl_seq_GET(l->ifs, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3063 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3064 ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3065 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3066 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3067 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3068
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3069 if (++gen_index < asdl_seq_LEN(generators))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3070 if (!compiler_listcomp_generator(c, tmpname,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3071 generators, gen_index, elt))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3072 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3073
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3074 /* only append after the last for generator */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3075 if (gen_index >= asdl_seq_LEN(generators)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3076 if (!compiler_nameop(c, tmpname, Load))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3077 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3078 VISIT(c, expr, elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3079 ADDOP_I(c, CALL_FUNCTION, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3080 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3081
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3082 compiler_use_next_block(c, skip);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3083 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3084 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3085 ADDOP_I(c, JUMP_FORWARD, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3086 if (i == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3087 compiler_use_next_block(c, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3088 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3089 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3090 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3091 compiler_use_next_block(c, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3092 /* delete the append method added to locals */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3093 if (gen_index == 1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3094 if (!compiler_nameop(c, tmpname, Del))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3095 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3096
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3097 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3098 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3099
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3100 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3101 compiler_listcomp(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3102 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3103 char tmpname[256];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3104 identifier tmp;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3105 int rc = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3106 static identifier append;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3107 asdl_seq *generators = e->v.ListComp.generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3108
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3109 assert(e->kind == ListComp_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3110 if (!append) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3111 append = PyString_InternFromString("append");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3112 if (!append)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3113 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3114 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3115 PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]", ++c->u->u_tmpname);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3116 tmp = PyString_FromString(tmpname);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3117 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3118 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3119 ADDOP_I(c, BUILD_LIST, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3120 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3121 ADDOP_O(c, LOAD_ATTR, append, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3122 if (compiler_nameop(c, tmp, Store))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3123 rc = compiler_listcomp_generator(c, tmp, generators, 0,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3124 e->v.ListComp.elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3125 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3126 return rc;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3127 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3128
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3129 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3130 compiler_genexp_generator(struct compiler *c,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3131 asdl_seq *generators, int gen_index,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3132 expr_ty elt)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3133 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3134 /* generate code for the iterator, then each of the ifs,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3135 and then write to the element */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3136
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3137 comprehension_ty ge;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3138 basicblock start, anchor, skip, if_cleanup, *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3139 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3140
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3141 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3142 skip = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3143 if_cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3144 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3145 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3146
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3147 if (start == NULL \|\| skip == NULL \|\| if_cleanup == NULL \|\|
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3148 anchor == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3149 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3150
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3151 ge = asdl_seq_GET(generators, gen_index);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3152 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3153 if (!compiler_push_fblock(c, LOOP, start))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3154 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3155
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3156 if (gen_index == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3157 /* Receive outermost iter as an implicit argument */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3158 c->u->u_argcount = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3159 ADDOP_I(c, LOAD_FAST, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3160 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3161 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3162 /* Sub-iter - calculate on the fly */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3163 VISIT(c, expr, ge->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3164 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3165 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3166 compiler_use_next_block(c, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3167 ADDOP_JREL(c, FOR_ITER, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3168 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3169 VISIT(c, expr, ge->target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3170
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3171 /* XXX this needs to be cleaned up...a lot! */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3172 n = asdl_seq_LEN(ge->ifs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3173 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3174 expr_ty e = asdl_seq_GET(ge->ifs, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3175 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3176 ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3177 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3178 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3179 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3180
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3181 if (++gen_index < asdl_seq_LEN(generators))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3182 if (!compiler_genexp_generator(c, generators, gen_index, elt))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3183 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3184
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3185 /* only append after the last 'for' generator */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3186 if (gen_index >= asdl_seq_LEN(generators)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3187 VISIT(c, expr, elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3188 ADDOP(c, YIELD_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3189 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3190
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3191 compiler_use_next_block(c, skip);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3192 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3193 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3194 ADDOP_I(c, JUMP_FORWARD, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3195 if (i == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3196 compiler_use_next_block(c, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3197
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3198 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3199 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3200 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3201 compiler_use_next_block(c, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3202 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3203 compiler_pop_fblock(c, LOOP, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3204 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3205
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3206 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3207 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3208
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3209 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3210 compiler_genexp(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3211 {
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	3212 static identifier name;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3213 PyCodeObject *co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3214 expr_ty outermost_iter = ((comprehension_ty)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3215 (asdl_seq_GET(e->v.GeneratorExp.generators,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3216 0)))->iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3217
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	3218 if (!name) {
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	3219 name = PyString_FromString("<genexpr>");
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	3220 if (!name)
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	3221 return 0;
29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	3222 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3223
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3224 if (!compiler_enter_scope(c, name, (void *)e, e->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3225 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3226 compiler_genexp_generator(c, e->v.GeneratorExp.generators, 0,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3227 e->v.GeneratorExp.elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3228 co = assemble(c, 1);
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	3229 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3230 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3231 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3232
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3233 compiler_make_closure(c, co, 0);
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3234 Py_DECREF(co);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3235
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3236 VISIT(c, expr, outermost_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3237 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3238 ADDOP_I(c, CALL_FUNCTION, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3239
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3240 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3241 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3242
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3243 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3244 compiler_visit_keyword(struct compiler *c, keyword_ty k)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3245 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3246 ADDOP_O(c, LOAD_CONST, k->arg, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3247 VISIT(c, expr, k->value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3248 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3249 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3250
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3251 /* Test whether expression is constant. For constants, report
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3252 whether they are true or false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3253
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3254 Return values: 1 for true, 0 for false, -1 for non-constant.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3255 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3256
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3257 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3258 expr_constant(expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3259 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3260 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3261 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3262 return PyObject_IsTrue(e->v.Num.n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3263 case Str_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3264 return PyObject_IsTrue(e->v.Str.s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3265 default:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3266 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3267 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3268 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3269
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3270 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3271 compiler_visit_expr(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3272 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3273 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3274
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3275 if (e->lineno > c->u->u_lineno) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3276 c->u->u_lineno = e->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3277 c->u->u_lineno_set = false;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3278 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3279 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3280 case BoolOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3281 return compiler_boolop(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3282 case BinOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3283 VISIT(c, expr, e->v.BinOp.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3284 VISIT(c, expr, e->v.BinOp.right);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3285 ADDOP(c, binop(c, e->v.BinOp.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3286 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3287 case UnaryOp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3288 VISIT(c, expr, e->v.UnaryOp.operand);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3289 ADDOP(c, unaryop(e->v.UnaryOp.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3290 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3291 case Lambda_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3292 return compiler_lambda(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3293 case Dict_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3294 /* XXX get rid of arg? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3295 ADDOP_I(c, BUILD_MAP, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3296 n = asdl_seq_LEN(e->v.Dict.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3297 /* We must arrange things just right for STORE_SUBSCR.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3298 It wants the stack to look like (value) (dict) (key) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3299 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3300 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3301 VISIT(c, expr, asdl_seq_GET(e->v.Dict.values, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3302 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3303 VISIT(c, expr, asdl_seq_GET(e->v.Dict.keys, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3304 ADDOP(c, STORE_SUBSCR);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3305 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3306 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3307 case ListComp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3308 return compiler_listcomp(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3309 case GeneratorExp_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3310 return compiler_genexp(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3311 case Yield_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3312 if (c->u->u_ste->ste_type != FunctionBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3313 return compiler_error(c, "'yield' outside function");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3314 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3315 for (i = 0; i < c->u->u_nfblocks; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3316 if (c->u->u_fblock[i].fb_type == FINALLY_TRY)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3317 return compiler_error(
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3318 c, "'yield' not allowed in a 'try' "
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3319 "block with a 'finally' clause");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3320 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3321 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3322 if (e->v.Yield.value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3323 VISIT(c, expr, e->v.Yield.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3324 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3325 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3326 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3327 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3328 ADDOP(c, YIELD_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3329 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3330 case Compare_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3331 return compiler_compare(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3332 case Call_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3333 return compiler_call(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3334 case Repr_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3335 VISIT(c, expr, e->v.Repr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3336 ADDOP(c, UNARY_CONVERT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3337 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3338 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3339 ADDOP_O(c, LOAD_CONST, e->v.Num.n, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3340 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3341 case Str_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3342 ADDOP_O(c, LOAD_CONST, e->v.Str.s, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3343 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3344 /* The following exprs can be assignment targets. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3345 case Attribute_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3346 if (e->v.Attribute.ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3347 VISIT(c, expr, e->v.Attribute.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3348 switch (e->v.Attribute.ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3349 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3350 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3351 /* Fall through to load */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3352 case Load:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3353 ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3354 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3355 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3356 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3357 /* Fall through to save */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3358 case Store:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3359 ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3360 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3361 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3362 ADDOP_NAME(c, DELETE_ATTR, e->v.Attribute.attr, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3363 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3364 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3365 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3366 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3367 "param invalid in attribute expression");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3368 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3369 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3370 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3371 case Subscript_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3372 switch (e->v.Subscript.ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3373 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3374 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3375 VISIT_SLICE(c, e->v.Subscript.slice, AugLoad);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3376 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3377 case Load:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3378 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3379 VISIT_SLICE(c, e->v.Subscript.slice, Load);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3380 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3381 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3382 VISIT_SLICE(c, e->v.Subscript.slice, AugStore);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3383 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3384 case Store:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3385 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3386 VISIT_SLICE(c, e->v.Subscript.slice, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3387 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3388 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3389 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3390 VISIT_SLICE(c, e->v.Subscript.slice, Del);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3391 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3392 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3393 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3394 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3395 "param invalid in subscript expression");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3396 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3397 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3398 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3399 case Name_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3400 return compiler_nameop(c, e->v.Name.id, e->v.Name.ctx);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3401 /* child nodes of List and Tuple will have expr_context set */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3402 case List_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3403 return compiler_list(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3404 case Tuple_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3405 return compiler_tuple(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3406 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3407 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3408 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3409
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3410 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3411 compiler_augassign(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3412 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3413 expr_ty e = s->v.AugAssign.target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3414 expr_ty auge;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3415
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3416 assert(s->kind == AugAssign_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3417
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3418 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3419 case Attribute_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3420 auge = Attribute(e->v.Attribute.value, e->v.Attribute.attr,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	3421 AugLoad, e->lineno, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3422 if (auge == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3423 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3424 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3425 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3426 ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3427 auge->v.Attribute.ctx = AugStore;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3428 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3429 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3430 case Subscript_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3431 auge = Subscript(e->v.Subscript.value, e->v.Subscript.slice,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35993 diff changeset	3432 AugLoad, e->lineno, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3433 if (auge == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3434 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3435 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3436 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3437 ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3438 auge->v.Subscript.ctx = AugStore;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3439 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3440 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3441 case Name_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3442 VISIT(c, expr, s->v.AugAssign.target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3443 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3444 ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3445 return compiler_nameop(c, e->v.Name.id, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3446 default:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3447 PyErr_Format(PyExc_SystemError,
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3448 "invalid node type (%d) for augmented assignment",
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3449 e->kind);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3450 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3451 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3452 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3453 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3454
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3455 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3456 compiler_push_fblock(struct compiler c, enum fblocktype t, basicblock b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3457 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3458 struct fblockinfo *f;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3459 if (c->u->u_nfblocks >= CO_MAXBLOCKS)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3460 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3461 f = &c->u->u_fblock[c->u->u_nfblocks++];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3462 f->fb_type = t;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3463 f->fb_block = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3464 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3465 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3466
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3467 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3468 compiler_pop_fblock(struct compiler c, enum fblocktype t, basicblock b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3469 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3470 struct compiler_unit *u = c->u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3471 assert(u->u_nfblocks > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3472 u->u_nfblocks--;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3473 assert(u->u_fblock[u->u_nfblocks].fb_type == t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3474 assert(u->u_fblock[u->u_nfblocks].fb_block == b);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3475 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3476
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3477 /* Raises a SyntaxError and returns 0.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3478 If something goes wrong, a different exception may be raised.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3479 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3480
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3481 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3482 compiler_error(struct compiler c, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3483 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3484 PyObject *loc;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3485 PyObject u = NULL, v = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3486
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3487 loc = PyErr_ProgramText(c->c_filename, c->u->u_lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3488 if (!loc) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3489 Py_INCREF(Py_None);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3490 loc = Py_None;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3491 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3492 u = Py_BuildValue("(ziOO)", c->c_filename, c->u->u_lineno,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3493 Py_None, loc);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3494 if (!u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3495 goto exit;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3496 v = Py_BuildValue("(zO)", errstr, u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3497 if (!v)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3498 goto exit;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3499 PyErr_SetObject(PyExc_SyntaxError, v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3500 exit:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3501 Py_DECREF(loc);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3502 Py_XDECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3503 Py_XDECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3504 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3505 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3506
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3507 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3508 compiler_handle_subscr(struct compiler c, const char kind,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3509 expr_context_ty ctx)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3510 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3511 int op = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3512
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3513 /* XXX this code is duplicated */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3514 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3515 case AugLoad: /* fall through to Load */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3516 case Load: op = BINARY_SUBSCR; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3517 case AugStore:/* fall through to Store */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3518 case Store: op = STORE_SUBSCR; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3519 case Del: op = DELETE_SUBSCR; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3520 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3521 PyErr_Format(PyExc_SystemError,
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3522 "invalid %s kind %d in subscript\n",
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3523 kind, ctx);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3524 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3525 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3526 if (ctx == AugLoad) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3527 ADDOP_I(c, DUP_TOPX, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3528 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3529 else if (ctx == AugStore) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3530 ADDOP(c, ROT_THREE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3531 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3532 ADDOP(c, op);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3533 return 1;
69 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
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3536 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3537 compiler_slice(struct compiler *c, slice_ty s, expr_context_ty ctx)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3538 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3539 int n = 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3540 assert(s->kind == Slice_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3541
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3542 /* only handles the cases where BUILD_SLICE is emitted */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3543 if (s->v.Slice.lower) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3544 VISIT(c, expr, s->v.Slice.lower);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3545 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3546 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3547 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3548 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3549
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3550 if (s->v.Slice.upper) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3551 VISIT(c, expr, s->v.Slice.upper);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3552 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3553 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3554 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3555 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3556
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3557 if (s->v.Slice.step) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3558 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3559 VISIT(c, expr, s->v.Slice.step);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3560 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3561 ADDOP_I(c, BUILD_SLICE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3562 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3563 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3564
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3565 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3566 compiler_simple_slice(struct compiler *c, slice_ty s, expr_context_ty ctx)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3567 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3568 int op = 0, slice_offset = 0, stack_count = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3569
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3570 assert(s->v.Slice.step == NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3571 if (s->v.Slice.lower) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3572 slice_offset++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3573 stack_count++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3574 if (ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3575 VISIT(c, expr, s->v.Slice.lower);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3576 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3577 if (s->v.Slice.upper) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3578 slice_offset += 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3579 stack_count++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3580 if (ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3581 VISIT(c, expr, s->v.Slice.upper);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3582 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3583
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3584 if (ctx == AugLoad) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3585 switch (stack_count) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3586 case 0: ADDOP(c, DUP_TOP); break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3587 case 1: ADDOP_I(c, DUP_TOPX, 2); break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3588 case 2: ADDOP_I(c, DUP_TOPX, 3); break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3589 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3590 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3591 else if (ctx == AugStore) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3592 switch (stack_count) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3593 case 0: ADDOP(c, ROT_TWO); break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3594 case 1: ADDOP(c, ROT_THREE); break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3595 case 2: ADDOP(c, ROT_FOUR); break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3596 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3597 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3598
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3599 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3600 case AugLoad: /* fall through to Load */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3601 case Load: op = SLICE; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3602 case AugStore:/* fall through to Store */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3603 case Store: op = STORE_SLICE; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3604 case Del: op = DELETE_SLICE; break;
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3605 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3606 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3607 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3608 "param invalid in simple slice");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3609 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3610 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3611
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3612 ADDOP(c, op + slice_offset);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3613 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3614 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3615
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3616 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3617 compiler_visit_nested_slice(struct compiler *c, slice_ty s,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3618 expr_context_ty ctx)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3619 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3620 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3621 case Ellipsis_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3622 ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3623 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3624 case Slice_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3625 return compiler_slice(c, s, ctx);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3626 case Index_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3627 VISIT(c, expr, s->v.Index.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3628 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3629 case ExtSlice_kind:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3630 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3631 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3632 "extended slice invalid in nested slice");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3633 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3634 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3635 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3636 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3637
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3638
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3639 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3640 compiler_visit_slice(struct compiler *c, slice_ty s, expr_context_ty ctx)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3641 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3642 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3643 case Ellipsis_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3644 ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3645 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3646 case Slice_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3647 if (!s->v.Slice.step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3648 return compiler_simple_slice(c, s, ctx);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3649 if (!compiler_slice(c, s, ctx))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3650 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3651 if (ctx == AugLoad) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3652 ADDOP_I(c, DUP_TOPX, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3653 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3654 else if (ctx == AugStore) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3655 ADDOP(c, ROT_THREE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3656 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3657 return compiler_handle_subscr(c, "slice", ctx);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3658 case ExtSlice_kind: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3659 int i, n = asdl_seq_LEN(s->v.ExtSlice.dims);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3660 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3661 slice_ty sub = asdl_seq_GET(s->v.ExtSlice.dims, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3662 if (!compiler_visit_nested_slice(c, sub, ctx))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3663 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3664 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3665 ADDOP_I(c, BUILD_TUPLE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3666 return compiler_handle_subscr(c, "extended slice", ctx);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3667 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3668 case Index_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3669 if (ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3670 VISIT(c, expr, s->v.Index.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3671 return compiler_handle_subscr(c, "index", ctx);
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3672 default:
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3673 PyErr_Format(PyExc_SystemError,
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3674 "invalid slice %d", s->kind);
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3675 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3676 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3677 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3678 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3679
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3680 /* do depth-first search of basic block graph, starting with block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3681 post records the block indices in post-order.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3682
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3683 XXX must handle implicit jumps from one block to next
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3684 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3685
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3686 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3687 dfs(struct compiler c, basicblock b, struct assembler *a)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3688 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3689 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3690 struct instr *instr = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3691
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3692 if (b->b_seen)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3693 return;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3694 b->b_seen = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3695 if (b->b_next != NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3696 dfs(c, b->b_next, a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3697 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3698 instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3699 if (instr->i_jrel \|\| instr->i_jabs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3700 dfs(c, instr->i_target, a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3701 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3702 a->a_postorder[a->a_nblocks++] = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3703 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3704
35860 9b885c934144 make internal method static Neal Norwitz <nnorwitz@gmail.com> parents: 35797 diff changeset	3705 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3706 stackdepth_walk(struct compiler c, basicblock b, int depth, int maxdepth)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3707 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3708 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3709 struct instr *instr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3710 if (b->b_seen \|\| b->b_startdepth >= depth)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3711 return maxdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3712 b->b_seen = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3713 b->b_startdepth = depth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3714 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3715 instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3716 depth += opcode_stack_effect(instr->i_opcode, instr->i_oparg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3717 if (depth > maxdepth)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3718 maxdepth = depth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3719 assert(depth >= 0); /* invalid code or bug in stackdepth() */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3720 if (instr->i_jrel \|\| instr->i_jabs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3721 maxdepth = stackdepth_walk(c, instr->i_target,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3722 depth, maxdepth);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3723 if (instr->i_opcode == JUMP_ABSOLUTE \|\|
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3724 instr->i_opcode == JUMP_FORWARD) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3725 goto out; /* remaining code is dead */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3726 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3727 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3728 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3729 if (b->b_next)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3730 maxdepth = stackdepth_walk(c, b->b_next, depth, maxdepth);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3731 out:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3732 b->b_seen = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3733 return maxdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3734 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3735
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3736 /* Find the flow path that needs the largest stack. We assume that
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3737 * cycles in the flow graph have no net effect on the stack depth.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3738 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3739 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3740 stackdepth(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3741 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3742 basicblock b, entryblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3743 entryblock = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3744 for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3745 b->b_seen = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3746 b->b_startdepth = INT_MIN;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3747 entryblock = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3748 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3749 return stackdepth_walk(c, entryblock, 0, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3750 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3751
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3752 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3753 assemble_init(struct assembler *a, int nblocks, int firstlineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3754 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3755 memset(a, 0, sizeof(struct assembler));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3756 a->a_lineno = firstlineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3757 a->a_bytecode = PyString_FromStringAndSize(NULL, DEFAULT_CODE_SIZE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3758 if (!a->a_bytecode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3759 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3760 a->a_lnotab = PyString_FromStringAndSize(NULL, DEFAULT_LNOTAB_SIZE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3761 if (!a->a_lnotab)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3762 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3763 a->a_postorder = (basicblock **)PyObject_Malloc(
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3764 sizeof(basicblock ) nblocks);
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3765 if (!a->a_postorder) {
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3766 PyErr_NoMemory();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3767 return 0;
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3768 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3769 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3770 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3771
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3772 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3773 assemble_free(struct assembler *a)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3774 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3775 Py_XDECREF(a->a_bytecode);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3776 Py_XDECREF(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3777 if (a->a_postorder)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3778 PyObject_Free(a->a_postorder);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3779 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3780
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3781 /* Return the size of a basic block in bytes. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3782
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3783 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3784 instrsize(struct instr *instr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3785 {
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3786 if (!instr->i_hasarg)
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3787 return 1;
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3788 if (instr->i_oparg > 0xffff)
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3789 return 6;
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3790 return 3;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3791 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3792
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3793 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3794 blocksize(basicblock *b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3795 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3796 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3797 int size = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3798
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3799 for (i = 0; i < b->b_iused; i++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3800 size += instrsize(&b->b_instr[i]);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3801 return size;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3802 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3803
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3804 /* All about a_lnotab.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3805
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3806 c_lnotab is an array of unsigned bytes disguised as a Python string.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3807 It is used to map bytecode offsets to source code line #s (when needed
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3808 for tracebacks).
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3809
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3810 The array is conceptually a list of
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3811 (bytecode offset increment, line number increment)
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3812 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	3813
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3814 byte code offset source code line number
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3815 0 1
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3816 6 2
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3817 50 7
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3818 350 307
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3819 361 308
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3820
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3821 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	3822 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	3823
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3824 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	3825
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3826 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	3827 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	3828 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	3829 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	3830 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	3831 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	3832 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	3833 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	3834
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3835 lineno = addr = 0
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3836 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	3837 addr += addr_incr
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3838 if addr > A:
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3839 return lineno
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3840 lineno += line_incr
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3841
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3842 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	3843 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	3844 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	3845 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	3846 255, 0, 45, 255, 0, 45.
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3847 */
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3848
17518 f939ce52a734 Make some private symbols static. Guido van Rossum <guido@python.org> parents: 17355 diff changeset	3849 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3850 assemble_lnotab(struct assembler a, struct instr i)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3851 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3852 int d_bytecode, d_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3853 int len;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3854 char *lnotab;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3855
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3856 d_bytecode = a->a_offset - a->a_lineno_off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3857 d_lineno = i->i_lineno - a->a_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3858
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3859 assert(d_bytecode >= 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3860 assert(d_lineno >= 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3861
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3862 if (d_lineno == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3863 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3864
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3865 if (d_bytecode > 255) {
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	3866 int j, nbytes, ncodes = d_bytecode / 255;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3867 nbytes = a->a_lnotab_off + 2 * ncodes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3868 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3869 if (nbytes >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3870 if (len * 2 < nbytes)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3871 len = nbytes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3872 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3873 len *= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3874 if (_PyString_Resize(&a->a_lnotab, len) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3875 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3876 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3877 lnotab = PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	3878 for (j = 0; j < ncodes; j++) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3879 *lnotab++ = 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3880 *lnotab++ = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3881 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3882 d_bytecode -= ncodes * 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3883 a->a_lnotab_off += ncodes * 2;
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	3884 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3885 assert(d_bytecode <= 255);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3886 if (d_lineno > 255) {
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	3887 int j, nbytes, ncodes = d_lineno / 255;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3888 nbytes = a->a_lnotab_off + 2 * ncodes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3889 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3890 if (nbytes >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3891 if (len * 2 < nbytes)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3892 len = nbytes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3893 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3894 len *= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3895 if (_PyString_Resize(&a->a_lnotab, len) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3896 return 0;
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3897 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3898 lnotab = PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3899 *lnotab++ = 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3900 *lnotab++ = d_bytecode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3901 d_bytecode = 0;
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	3902 for (j = 1; j < ncodes; j++) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3903 *lnotab++ = 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3904 *lnotab++ = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3905 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3906 d_lineno -= ncodes * 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3907 a->a_lnotab_off += ncodes * 2;
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	3908 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3909
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3910 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3911 if (a->a_lnotab_off + 2 >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3912 if (_PyString_Resize(&a->a_lnotab, len * 2) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3913 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3914 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3915 lnotab = PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3916
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3917 a->a_lnotab_off += 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3918 if (d_bytecode) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3919 *lnotab++ = d_bytecode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3920 *lnotab++ = d_lineno;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3921 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3922 else { /* First line of a block; def stmt, etc. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3923 *lnotab++ = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3924 *lnotab++ = d_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3925 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3926 a->a_lineno = i->i_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3927 a->a_lineno_off = a->a_offset;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	3928 return 1;
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	3929 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3930
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3931 /* assemble_emit()
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3932 Extend the bytecode with a new instruction.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3933 Update lnotab if necessary.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3934 */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3935
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	3936 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3937 assemble_emit(struct assembler a, struct instr i)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3938 {
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3939 int size, arg = 0, ext = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3940 int len = PyString_GET_SIZE(a->a_bytecode);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3941 char *code;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3942
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3943 size = instrsize(i);
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3944 if (i->i_hasarg) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3945 arg = i->i_oparg;
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3946 ext = arg >> 16;
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	3947 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3948 if (i->i_lineno && !assemble_lnotab(a, i))
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3949 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3950 if (a->a_offset + size >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3951 if (_PyString_Resize(&a->a_bytecode, len * 2) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3952 return 0;
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	3953 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3954 code = PyString_AS_STRING(a->a_bytecode) + a->a_offset;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3955 a->a_offset += size;
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3956 if (size == 6) {
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3957 assert(i->i_hasarg);
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3958 *code++ = (char)EXTENDED_ARG;
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3959 *code++ = ext & 0xff;
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3960 *code++ = ext >> 8;
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3961 arg &= 0xffff;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3962 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3963 *code++ = i->i_opcode;
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3964 if (i->i_hasarg) {
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3965 assert(size == 3 \|\| size == 6);
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3966 *code++ = arg & 0xff;
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3967 *code++ = arg >> 8;
19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3968 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3969 return 1;
19187 30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	3970 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	3971
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3972 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3973 assemble_jump_offsets(struct assembler a, struct compiler c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3974 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3975 basicblock *b;
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3976 int bsize, totsize, extended_arg_count, last_extended_arg_count = 0;
5233 b749d2dd7582 Added assert statement. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3977 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3978
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3979 /* Compute the size of each block and fixup jump args.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3980 Replace block pointer with position in bytecode. */
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3981 start:
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3982 totsize = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3983 for (i = a->a_nblocks - 1; i >= 0; i--) {
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	3984 b = a->a_postorder[i];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3985 bsize = blocksize(b);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3986 b->b_offset = totsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3987 totsize += bsize;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3988 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3989 extended_arg_count = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3990 for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3991 bsize = b->b_offset;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3992 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3993 struct instr *instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3994 /* Relative jumps are computed relative to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3995 the instruction pointer after fetching
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3996 the jump instruction.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3997 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3998 bsize += instrsize(instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3999 if (instr->i_jabs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4000 instr->i_oparg = instr->i_target->b_offset;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4001 else if (instr->i_jrel) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4002 int delta = instr->i_target->b_offset - bsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4003 instr->i_oparg = delta;
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	4004 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4005 else
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4006 continue;
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4007 if (instr->i_oparg > 0xffff)
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4008 extended_arg_count++;
18333 41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	4009 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	4010 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4011
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4012 /* XXX: This is an awful hack that could hurt performance, but
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4013 on the bright side it should work until we come up
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4014 with a better solution.
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4015
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4016 In the meantime, should the goto be dropped in favor
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4017 of a loop?
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4018
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4019 The issue is that in the first loop blocksize() is called
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4020 which calls instrsize() which requires i_oparg be set
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4021 appropriately. There is a bootstrap problem because
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4022 i_oparg is calculated in the second loop above.
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4023
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4024 So we loop until we stop seeing new EXTENDED_ARGs.
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4025 The only EXTENDED_ARGs that could be popping up are
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4026 ones in jump instructions. So this should converge
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4027 fairly quickly.
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4028 */
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4029 if (last_extended_arg_count != extended_arg_count) {
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4030 last_extended_arg_count = extended_arg_count;
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4031 goto start;
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4032 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4033 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4034
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4035 static PyObject *
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4036 dict_keys_inorder(PyObject *dict, int offset)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4037 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4038 PyObject tuple, k, *v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	4039 Py_ssize_t i, pos = 0, size = PyDict_Size(dict);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4040
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4041 tuple = PyTuple_New(size);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4042 if (tuple == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4043 return NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4044 while (PyDict_Next(dict, &pos, &k, &v)) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4045 i = PyInt_AS_LONG(v);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4046 k = PyTuple_GET_ITEM(k, 0);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4047 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	4048 assert((i - offset) < size);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4049 assert((i - offset) >= 0);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4050 PyTuple_SET_ITEM(tuple, i - offset, k);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4051 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4052 return tuple;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4053 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4054
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4055 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4056 compute_code_flags(struct compiler *c)
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4057 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4058 PySTEntryObject *ste = c->u->u_ste;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4059 int flags = 0, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4060 if (ste->ste_type != ModuleBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4061 flags \|= CO_NEWLOCALS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4062 if (ste->ste_type == FunctionBlock) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4063 if (!ste->ste_unoptimized)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4064 flags \|= CO_OPTIMIZED;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4065 if (ste->ste_nested)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4066 flags \|= CO_NESTED;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4067 if (ste->ste_generator)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4068 flags \|= CO_GENERATOR;
20867 40a88989d6cb Part of SF bug #478003 possible memory leaks in err handling. Tim Peters <tim.peters@gmail.com> parents: 20517 diff changeset	4069 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4070 if (ste->ste_varargs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4071 flags \|= CO_VARARGS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4072 if (ste->ste_varkeywords)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4073 flags \|= CO_VARKEYWORDS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4074 if (ste->ste_generator)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4075 flags \|= CO_GENERATOR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4076 if (c->c_flags->cf_flags & CO_FUTURE_DIVISION)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4077 flags \|= CO_FUTURE_DIVISION;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4078 n = PyDict_Size(c->u->u_freevars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4079 if (n < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4080 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4081 if (n == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4082 n = PyDict_Size(c->u->u_cellvars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4083 if (n < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4084 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4085 if (n == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4086 flags \|= CO_NOFREE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4087 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4088 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4089
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4090 return flags;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4091 }
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4092
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4093 static PyCodeObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4094 makecode(struct compiler c, struct assembler a)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4095 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4096 PyObject *tmp;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4097 PyCodeObject *co = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4098 PyObject *consts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4099 PyObject *names = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4100 PyObject *varnames = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4101 PyObject *filename = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4102 PyObject *name = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4103 PyObject *freevars = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4104 PyObject *cellvars = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4105 PyObject *bytecode = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4106 int nlocals, flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4107
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4108 tmp = dict_keys_inorder(c->u->u_consts, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4109 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4110 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4111 consts = PySequence_List(tmp); /* optimize_code requires a list */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4112 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4113
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4114 names = dict_keys_inorder(c->u->u_names, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4115 varnames = dict_keys_inorder(c->u->u_varnames, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4116 if (!consts \|\| !names \|\| !varnames)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4117 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4118
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4119 cellvars = dict_keys_inorder(c->u->u_cellvars, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4120 if (!cellvars)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4121 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4122 freevars = dict_keys_inorder(c->u->u_freevars, PyTuple_Size(cellvars));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4123 if (!freevars)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4124 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4125 filename = PyString_FromString(c->c_filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4126 if (!filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4127 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4128
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4129 nlocals = PyDict_Size(c->u->u_varnames);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4130 flags = compute_code_flags(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4131 if (flags < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4132 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4133
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4134 bytecode = optimize_code(a->a_bytecode, consts, names, a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4135 if (!bytecode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4136 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4137
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4138 tmp = PyList_AsTuple(consts); /* PyCode_New requires a tuple */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4139 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4140 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4141 Py_DECREF(consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4142 consts = tmp;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4143
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4144 co = PyCode_New(c->u->u_argcount, nlocals, stackdepth(c), flags,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4145 bytecode, consts, names, varnames,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4146 freevars, cellvars,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4147 filename, c->u->u_name,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4148 c->u->u_firstlineno,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4149 a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4150 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4151 Py_XDECREF(consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4152 Py_XDECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4153 Py_XDECREF(varnames);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4154 Py_XDECREF(filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4155 Py_XDECREF(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4156 Py_XDECREF(freevars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4157 Py_XDECREF(cellvars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4158 Py_XDECREF(bytecode);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4159 return co;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4160 }
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4161
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4162 static PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4163 assemble(struct compiler *c, int addNone)
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4164 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4165 basicblock b, entryblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4166 struct assembler a;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4167 int i, j, nblocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4168 PyCodeObject *co = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4169
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4170 /* Make sure every block that falls off the end returns None.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4171 XXX NEXT_BLOCK() isn't quite right, because if the last
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4172 block ends with a jump or return b_next shouldn't set.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4173 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4174 if (!c->u->u_curblock->b_return) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4175 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4176 if (addNone)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4177 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4178 ADDOP(c, RETURN_VALUE);
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4179 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4180
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4181 nblocks = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4182 entryblock = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4183 for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4184 nblocks++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4185 entryblock = b;
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4186 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4187
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4188 if (!assemble_init(&a, nblocks, c->u->u_firstlineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4189 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4190 dfs(c, entryblock, &a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4191
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4192 /* Can't modify the bytecode after computing jump offsets. */
35789 19a37a9f4ef9 cleanup a bit and reuse instrsize (instruction size). working towards fixing problems with EXTENDED_ARG Neal Norwitz <nnorwitz@gmail.com> parents: 35781 diff changeset	4193 assemble_jump_offsets(&a, c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4194
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4195 /* Emit code in reverse postorder from dfs. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4196 for (i = a.a_nblocks - 1; i >= 0; i--) {
36225 56ad9f275bec Fix icc warnings: single bit fields should be unsigned, shadowing local variables Neal Norwitz <nnorwitz@gmail.com> parents: 36173 diff changeset	4197 b = a.a_postorder[i];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4198 for (j = 0; j < b->b_iused; j++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4199 if (!assemble_emit(&a, &b->b_instr[j]))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4200 goto error;
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	4201 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4202
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4203 if (_PyString_Resize(&a.a_lnotab, a.a_lnotab_off) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4204 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4205 if (_PyString_Resize(&a.a_bytecode, a.a_offset) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4206 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4207
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4208 co = makecode(c, &a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4209 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4210 assemble_free(&a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4211 return 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	4212 }

Mercurial > cpython-lru_cache-weakref

annotate Python/compile.c @ 36664:7bfbfb2ef4e2 legacy-trunk