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

annotate Python/compile.c @ 39135:12e973bdfeee legacy-trunk

Fix more memory allocation issues found with failmalloc.

author	Neal Norwitz <nnorwitz@gmail.com>
date	Sat, 22 Jul 2006 16:20:49 +0000
parents	7c09b66f04bd
children	1805e684dc92

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
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	8 * 2. Builds a symbol table. See symtable.c.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	9 * 3. Generate code for basic blocks. See compiler_mod() in this file.
35742 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
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	11 * this file.
35742 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 *
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	16 * CAUTION: The VISIT_* macros abort the current function when they
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	17 * encounter a problem. So don't invoke them when there is memory
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	18 * which needs to be released. Code blocks are OK, as the compiler
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	19 * structure takes care of 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 /*
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	36 ISSUES:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	37
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	38 opcode_stack_effect() function should be reviewed since stack depth bugs
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	39 could be really hard to find later.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	40
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	41 Dead code is being generated (i.e. after unconditional jumps).
36797 7285c37d7633 Update known issues to reflect reality Neal Norwitz <nnorwitz@gmail.com> parents: 36786 diff changeset	42 XXX(nnorwitz): not sure this is still true
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	43 */
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 #define DEFAULT_BLOCK_SIZE 16
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	46 #define DEFAULT_BLOCKS 8
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	47 #define DEFAULT_CODE_SIZE 128
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	48 #define DEFAULT_LNOTAB_SIZE 16
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	49
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	50 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	51 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	52 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	53 unsigned i_hasarg : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	54 unsigned char i_opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	55 int i_oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	56 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	57 int i_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	58 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	59
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	60 typedef struct basicblock_ {
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	61 /* Each basicblock in a compilation unit is linked via b_list in the
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	62 reverse order that the block are allocated. b_list points to the next
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	63 block, not to be confused with b_next, which is next by control flow. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	64 struct basicblock_ *b_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	65 /* number of instructions used */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	66 int b_iused;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	67 /* length of instruction array (b_instr) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	68 int b_ialloc;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	69 /* pointer to an array of instructions, initially NULL */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	70 struct instr *b_instr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	71 /* 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	72 block reached by normal control flow. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	73 struct basicblock_ *b_next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	74 /* 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	75 unsigned b_seen : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	76 /* 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	77 unsigned b_return : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	78 /* 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	79 int b_startdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	80 /* instruction offset for block, computed by assemble_jump_offsets() */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	81 int b_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	82 } basicblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	83
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	84 /* fblockinfo tracks the current frame block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	85
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	86 A frame block is used to handle loops, try/except, and try/finally.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	87 It's called a frame block to distinguish it from a basic block in the
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	88 compiler IR.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	89 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	90
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	91 enum fblocktype { LOOP, EXCEPT, FINALLY_TRY, FINALLY_END };
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 struct fblockinfo {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	94 enum fblocktype fb_type;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	95 basicblock *fb_block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	96 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	97
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	98 /* 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	99 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	100 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	101 struct compiler_unit {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	102 PySTEntryObject *u_ste;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	103
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	104 PyObject *u_name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	105 /* The following fields are dicts that map objects to
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	106 the index of them in co_XXX. The index is used as
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	107 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	108 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	109 PyObject u_consts; / all constants */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	110 PyObject u_names; / all names */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	111 PyObject u_varnames; / local variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	112 PyObject u_cellvars; / cell variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	113 PyObject u_freevars; / free variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	114
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	115 PyObject u_private; / for private name mangling */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	116
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	117 int u_argcount; /* number of arguments for block */
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	118 /* Pointer to the most recently allocated block. By following b_list
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	119 members, you can reach all early allocated blocks. */
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	120 basicblock *u_blocks;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	121 basicblock u_curblock; / pointer to current block */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	122 int u_tmpname; /* temporary variables for list comps */
35742 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 */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	128 int u_lineno; /* the lineno for the current stmt */
35742 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
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	135 The u pointer points to the current compilation unit, while units
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	136 for enclosing blocks are stored in c_stack. The u and c_stack are
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	137 managed by compiler_enter_scope() and compiler_exit_scope().
35742 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;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	143 PyFutureFeatures c_future; / pointer to module's __future__ */
35742 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;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	147 int c_nestlevel;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	148
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	149 struct compiler_unit u; / compiler state for current block */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	150 PyObject c_stack; / Python list holding compiler_unit ptrs */
35742 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) */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 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 */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	157 int a_offset; /* offset into bytecode */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	158 int a_nblocks; /* number of reachable blocks */
35742 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 */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	162 int a_lineno; /* last lineno of emitted instruction */
35742 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
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	194 static int compiler_with(struct compiler *, stmt_ty);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	195
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	196 static PyCodeObject assemble(struct compiler , int addNone);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	197 static PyObject *__doc__;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	198
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	199 PyObject *
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	200 _Py_Mangle(PyObject privateobj, PyObject ident)
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	201 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	202 /* Name mangling: __private becomes _classname__private.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	203 This is independent from how the name is used. */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	204 const char p, name = PyString_AsString(ident);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	205 char *buffer;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	206 size_t nlen, plen;
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	207 if (privateobj == NULL \|\| name == NULL \|\| name[0] != '_' \|\|
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	208 name[1] != '_') {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	209 Py_INCREF(ident);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	210 return ident;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	211 }
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	212 p = PyString_AsString(privateobj);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	213 nlen = strlen(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	214 if (name[nlen-1] == '_' && name[nlen-2] == '_') {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	215 Py_INCREF(ident);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	216 return ident; /* Don't mangle __whatever__ */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	217 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	218 /* Strip leading underscores from class name */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	219 while (*p == '_')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	220 p++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	221 if (*p == '\0') {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	222 Py_INCREF(ident);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	223 return ident; /* Don't mangle if class is just underscores */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	224 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	225 plen = strlen(p);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	226 ident = PyString_FromStringAndSize(NULL, 1 + nlen + plen);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	227 if (!ident)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	228 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	229 /* ident = "_" + p[:plen] + name # i.e. 1+plen+nlen bytes */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	230 buffer = PyString_AS_STRING(ident);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	231 buffer[0] = '_';
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	232 strncpy(buffer+1, p, plen);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	233 strcpy(buffer+1+plen, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	234 return ident;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	235 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	238 compiler_init(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	239 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	240 memset(c, 0, sizeof(struct compiler));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	241
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	242 c->c_stack = PyList_New(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	243 if (!c->c_stack)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	244 return 0;
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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	247 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	248
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	249 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	250 PyAST_Compile(mod_ty mod, const char filename, PyCompilerFlags flags,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	251 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	252 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	253 struct compiler c;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	254 PyCodeObject *co = NULL;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	255 PyCompilerFlags local_flags;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	256 int merged;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	257
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	258 if (!__doc__) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	259 __doc__ = PyString_InternFromString("__doc__");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	260 if (!__doc__)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	261 return NULL;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	262 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	263
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	264 if (!compiler_init(&c))
36696 e0a77010d033 Fix assertions. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	265 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	266 c.c_filename = filename;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	267 c.c_arena = arena;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	268 c.c_future = PyFuture_FromAST(mod, filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	269 if (c.c_future == NULL)
36697 78de5f6b2f67 Clarify C-style exception handling with proper label name. Thomas Wouters <thomas@python.org> parents: 36696 diff changeset	270 goto finally;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	271 if (!flags) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	272 local_flags.cf_flags = 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	273 flags = &local_flags;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	274 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	275 merged = c.c_future->ff_features \| flags->cf_flags;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	276 c.c_future->ff_features = merged;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	277 flags->cf_flags = merged;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	278 c.c_flags = flags;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	279 c.c_nestlevel = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	280
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	281 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	282 if (c.c_st == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	283 if (!PyErr_Occurred())
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	284 PyErr_SetString(PyExc_SystemError, "no symtable");
36697 78de5f6b2f67 Clarify C-style exception handling with proper label name. Thomas Wouters <thomas@python.org> parents: 36696 diff changeset	285 goto finally;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	286 }
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 /* 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	289 c.c_encoding = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	290
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	291 co = compiler_mod(&c, mod);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	292
36697 78de5f6b2f67 Clarify C-style exception handling with proper label name. Thomas Wouters <thomas@python.org> parents: 36696 diff changeset	293 finally:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	294 compiler_free(&c);
36696 e0a77010d033 Fix assertions. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	295 assert(co \|\| PyErr_Occurred());
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	296 return co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	297 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	298
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	299 PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	300 PyNode_Compile(struct _node n, const char filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	301 {
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	302 PyCodeObject *co = NULL;
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	303 mod_ty mod;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	304 PyArena *arena = PyArena_New();
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	305 if (!arena)
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	306 return NULL;
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	307 mod = PyAST_FromNode(n, NULL, filename, arena);
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	308 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	309 co = PyAST_Compile(mod, filename, NULL, arena);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	310 PyArena_Free(arena);
30428 c2c10f1eb8e2 Fix leak discovered in test_new by Michael Hudson. Raymond Hettinger <python@rcn.com> parents: 30226 diff changeset	311 return co;
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	312 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	313
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	314 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	315 compiler_free(struct compiler *c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	316 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	317 if (c->c_st)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	318 PySymtable_Free(c->c_st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	319 if (c->c_future)
37558 286c81689826 Use PyObject_* allocator since FutureFeatures is small Neal Norwitz <nnorwitz@gmail.com> parents: 37555 diff changeset	320 PyObject_Free(c->c_future);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	321 Py_DECREF(c->c_stack);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	322 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	323
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	324 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	325 list2dict(PyObject *list)
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	326 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	327 Py_ssize_t i, n;
37067 1f4549865aad Fix some missing checks after PyTuple_New, PyList_New, PyDict_New Georg Brandl <georg@python.org> parents: 36965 diff changeset	328 PyObject v, k;
1f4549865aad Fix some missing checks after PyTuple_New, PyList_New, PyDict_New Georg Brandl <georg@python.org> parents: 36965 diff changeset	329 PyObject *dict = PyDict_New();
1f4549865aad Fix some missing checks after PyTuple_New, PyList_New, PyDict_New Georg Brandl <georg@python.org> parents: 36965 diff changeset	330 if (!dict) return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	331
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	332 n = PyList_Size(list);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	333 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	334 v = PyInt_FromLong(i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	335 if (!v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	336 Py_DECREF(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	337 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	338 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	339 k = PyList_GET_ITEM(list, i);
38406 8f7c7aeac3a5 Replace Py_BuildValue("OO") by PyTuple_Pack. Georg Brandl <georg@python.org> parents: 38084 diff changeset	340 k = PyTuple_Pack(2, k, k->ob_type);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	341 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	342 Py_XDECREF(k);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	343 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	344 Py_DECREF(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	345 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	346 }
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	347 Py_DECREF(k);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	348 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	349 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	350 return dict;
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	351 }
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	352
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	353 /* 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	354
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	355 src is a symbol table dictionary. If the scope of a name matches
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	356 either scope_type or flag is set, insert it into the new dict. The
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	357 values are integers, starting at offset and increasing by one for
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	358 each key.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	359 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	360
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	361 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	362 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	363 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	364 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	365 PyObject k, v, *dest = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	366
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	367 assert(offset >= 0);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	368 if (dest == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	369 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	370
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	371 while (PyDict_Next(src, &pos, &k, &v)) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	372 /* XXX this should probably be a macro in symtable.h */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	373 assert(PyInt_Check(v));
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	374 scope = (PyInt_AS_LONG(v) >> SCOPE_OFF) & SCOPE_MASK;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	375
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	376 if (scope == scope_type \|\| PyInt_AS_LONG(v) & flag) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	377 PyObject tuple, item = PyInt_FromLong(i);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	378 if (item == NULL) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	379 Py_DECREF(dest);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	380 return NULL;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	381 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	382 i++;
38406 8f7c7aeac3a5 Replace Py_BuildValue("OO") by PyTuple_Pack. Georg Brandl <georg@python.org> parents: 38084 diff changeset	383 tuple = PyTuple_Pack(2, k, k->ob_type);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	384 if (!tuple \|\| PyDict_SetItem(dest, tuple, item) < 0) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	385 Py_DECREF(item);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	386 Py_DECREF(dest);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	387 Py_XDECREF(tuple);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	388 return NULL;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	389 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	390 Py_DECREF(item);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	391 Py_DECREF(tuple);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	392 }
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	393 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	394 return dest;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	395 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	396
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	397 /* Begin: Peephole optimizations ----------------------------------------- */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	398
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	399 #define GETARG(arr, i) ((int)((arr[i+2]<<8) + arr[i+1]))
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	400 #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	401 #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	402 #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	403 #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	404 #define CODESIZE(op) (HAS_ARG(op) ? 3 : 1)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	405 #define ISBASICBLOCK(blocks, start, bytes) \
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	406 (blocks[start]==blocks[start+bytes-1])
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	407
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	408 /* Replace LOAD_CONST c1. LOAD_CONST c2 ... LOAD_CONST cn BUILD_TUPLE n
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	409 with LOAD_CONST (c1, c2, ... cn).
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	410 The consts table must still be in list form so that the
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	411 new constant (c1, c2, ... cn) can be appended.
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	412 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	413 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	414 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	415 */
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	416 static int
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	417 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	418 {
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	419 PyObject newconst, constant;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	420 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	421
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	422 /* Pre-conditions */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	423 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	424 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	425 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	426 for (i=0 ; i<n ; i++)
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	427 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	428
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	429 /* 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	430 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	431 if (newconst == NULL)
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	432 return 0;
33838 fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	433 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	434 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	435 arg = GETARG(codestr, (i*3));
33838 fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	436 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	437 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	438 Py_INCREF(constant);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	439 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	440 }
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	441
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	442 /* 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	443 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	444 Py_DECREF(newconst);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	445 return 0;
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	446 }
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	447 Py_DECREF(newconst);
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	448
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	449 /* 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	450 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	451 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	452 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	453 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	454 return 1;
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	455 }
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	456
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	457 /* Replace LOAD_CONST c1. LOAD_CONST c2 BINOP
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	458 with LOAD_CONST binop(c1,c2)
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	459 The consts table must still be in list form so that the
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	460 new constant can be appended.
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	461 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	462 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	463 If the new constant is a sequence, only folds when the size
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	464 is below a threshold value. That keeps pyc files from
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	465 becoming large in the presence of code like: (None,)*1000.
34506 bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	466 */
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	467 static int
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	468 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	469 {
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	470 PyObject newconst, v, *w;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	471 Py_ssize_t len_consts, size;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	472 int opcode;
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	473
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	474 /* Pre-conditions */
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	475 assert(PyList_CheckExact(consts));
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	476 assert(codestr[0] == LOAD_CONST);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	477 assert(codestr[3] == LOAD_CONST);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	478
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	479 /* Create new constant */
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	480 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	481 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	482 opcode = codestr[6];
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	483 switch (opcode) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	484 case BINARY_POWER:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	485 newconst = PyNumber_Power(v, w, Py_None);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	486 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	487 case BINARY_MULTIPLY:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	488 newconst = PyNumber_Multiply(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	489 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	490 case BINARY_DIVIDE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	491 /* Cannot fold this operation statically since
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	492 the result can depend on the run-time presence
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	493 of the -Qnew flag */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	494 return 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	495 case BINARY_TRUE_DIVIDE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	496 newconst = PyNumber_TrueDivide(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	497 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	498 case BINARY_FLOOR_DIVIDE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	499 newconst = PyNumber_FloorDivide(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	500 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	501 case BINARY_MODULO:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	502 newconst = PyNumber_Remainder(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	503 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	504 case BINARY_ADD:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	505 newconst = PyNumber_Add(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	506 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	507 case BINARY_SUBTRACT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	508 newconst = PyNumber_Subtract(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	509 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	510 case BINARY_SUBSCR:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	511 newconst = PyObject_GetItem(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	512 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	513 case BINARY_LSHIFT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	514 newconst = PyNumber_Lshift(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	515 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	516 case BINARY_RSHIFT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	517 newconst = PyNumber_Rshift(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	518 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	519 case BINARY_AND:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	520 newconst = PyNumber_And(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	521 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	522 case BINARY_XOR:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	523 newconst = PyNumber_Xor(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	524 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	525 case BINARY_OR:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	526 newconst = PyNumber_Or(v, w);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	527 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	528 default:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	529 /* Called with an unknown opcode */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	530 PyErr_Format(PyExc_SystemError,
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	531 "unexpected binary operation %d on a constant",
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	532 opcode);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	533 return 0;
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	534 }
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	535 if (newconst == NULL) {
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	536 PyErr_Clear();
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	537 return 0;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	538 }
34506 bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	539 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	540 if (size == -1)
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	541 PyErr_Clear();
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	542 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	543 Py_DECREF(newconst);
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	544 return 0;
bda933873758 Do not fold a constant if a large sequence will result. Raymond Hettinger <python@rcn.com> parents: 34359 diff changeset	545 }
34305 0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	546
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	547 /* 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	548 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	549 if (PyList_Append(consts, newconst)) {
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	550 Py_DECREF(newconst);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	551 return 0;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	552 }
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	553 Py_DECREF(newconst);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	554
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	555 /* 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	556 memset(codestr, NOP, 4);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	557 codestr[4] = LOAD_CONST;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	558 SETARG(codestr, 4, len_consts);
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	559 return 1;
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	560 }
0c326327e722 Teach the peephole optimizer to fold simple constant expressions. Raymond Hettinger <python@rcn.com> parents: 33925 diff changeset	561
34622 516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	562 static int
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	563 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	564 {
34630 660419bdb4ae Preserve sign of -0.0 when result is run through marshal. Raymond Hettinger <python@rcn.com> parents: 34626 diff changeset	565 PyObject newconst=NULL, v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	566 Py_ssize_t len_consts;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	567 int opcode;
34622 516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	568
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	569 /* Pre-conditions */
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	570 assert(PyList_CheckExact(consts));
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	571 assert(codestr[0] == LOAD_CONST);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	572
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	573 /* Create new constant */
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	574 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	575 opcode = codestr[3];
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	576 switch (opcode) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	577 case UNARY_NEGATIVE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	578 /* Preserve the sign of -0.0 */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	579 if (PyObject_IsTrue(v) == 1)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	580 newconst = PyNumber_Negative(v);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	581 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	582 case UNARY_CONVERT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	583 newconst = PyObject_Repr(v);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	584 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	585 case UNARY_INVERT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	586 newconst = PyNumber_Invert(v);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	587 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	588 default:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	589 /* Called with an unknown opcode */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	590 PyErr_Format(PyExc_SystemError,
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	591 "unexpected unary operation %d on a constant",
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	592 opcode);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	593 return 0;
34622 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 if (newconst == NULL) {
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	596 PyErr_Clear();
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	597 return 0;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	598 }
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	599
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	600 /* 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	601 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	602 if (PyList_Append(consts, newconst)) {
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	603 Py_DECREF(newconst);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	604 return 0;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	605 }
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	606 Py_DECREF(newconst);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	607
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	608 /* Write NOP LOAD_CONST newconst */
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	609 codestr[0] = NOP;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	610 codestr[1] = LOAD_CONST;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	611 SETARG(codestr, 1, len_consts);
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	612 return 1;
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	613 }
516bb8fd75b4 Teach the peepholer to fold unary operations on constants. Raymond Hettinger <python@rcn.com> parents: 34574 diff changeset	614
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	615 static unsigned int *
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	616 markblocks(unsigned char *code, int len)
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	617 {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	618 unsigned int blocks = (unsigned int )PyMem_Malloc(len*sizeof(int));
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	619 int i,j, opcode, blockcnt = 0;
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	620
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	621 if (blocks == NULL) {
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	622 PyErr_NoMemory();
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	623 return NULL;
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	624 }
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	625 memset(blocks, 0, len*sizeof(int));
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	626
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	627 /* Mark labels in the first pass */
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	628 for (i=0 ; i<len ; i+=CODESIZE(opcode)) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	629 opcode = code[i];
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	630 switch (opcode) {
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	631 case FOR_ITER:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	632 case JUMP_FORWARD:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	633 case JUMP_IF_FALSE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	634 case JUMP_IF_TRUE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	635 case JUMP_ABSOLUTE:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	636 case CONTINUE_LOOP:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	637 case SETUP_LOOP:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	638 case SETUP_EXCEPT:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	639 case SETUP_FINALLY:
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	640 j = GETJUMPTGT(code, i);
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	641 blocks[j] = 1;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	642 break;
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	643 }
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	644 }
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	645 /* Build block numbers in the second pass */
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	646 for (i=0 ; i<len ; i++) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	647 blockcnt += blocks[i]; /* increment blockcnt over labels */
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	648 blocks[i] = blockcnt;
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	649 }
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	650 return blocks;
6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	651 }
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	652
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	653 /* 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	654 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	655 to be appended.
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	656
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	657 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	658 containing extended arguments or that has a length over 32,700. That
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	659 allows us to avoid overflow and sign issues. Likewise, it bails when
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	660 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	661
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	662 Optimizations are restricted to simple transformations occuring within a
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	663 single basic block. All transformations keep the code size the same or
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	664 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	665 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	666 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	667
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	668 static PyObject *
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	669 optimize_code(PyObject code, PyObject consts, PyObject *names,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	670 PyObject *lineno_obj)
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	671 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	672 Py_ssize_t i, j, codelen;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	673 int nops, h, adj;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	674 int tgt, tgttgt, opcode;
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	675 unsigned char *codestr = NULL;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	676 unsigned char *lineno;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	677 int *addrmap = NULL;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	678 int new_line, cum_orig_line, last_line, tabsiz;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	679 int cumlc=0, lastlc=0; /* Count runs of consecutive LOAD_CONSTs */
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	680 unsigned int *blocks = NULL;
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	681 char *name;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	682
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	683 /* Bail out if an exception is set */
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	684 if (PyErr_Occurred())
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	685 goto exitUnchanged;
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	686
33272 bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	687 /* 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	688 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	689 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	690 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	691 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	692 goto exitUnchanged;
bac997b79b19 Bypass peepholing of code with lineno tables having intervals >= 255. Raymond Hettinger <python@rcn.com> parents: 33271 diff changeset	693
33249 c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	694 /* Avoid situations where jump retargeting could overflow */
33620 27aa0e119330 Replaced a test with an assertion. Raymond Hettinger <python@rcn.com> parents: 33539 diff changeset	695 assert(PyString_Check(code));
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	696 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	697 if (codelen > 32700)
33249 c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	698 goto exitUnchanged;
c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	699
c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	700 /* Make a modifiable copy of the code string */
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	701 codestr = (unsigned char *)PyMem_Malloc(codelen);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	702 if (codestr == NULL)
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	703 goto exitUnchanged;
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	704 codestr = (unsigned char *)memcpy(codestr,
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	705 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	706
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	707 /* Verify that RETURN_VALUE terminates the codestring. This allows
34626 fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	708 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	709 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	710 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	711 */
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	712 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	713 goto exitUnchanged;
fcacf9d4b8f0 Document how the pattern recognizer keeps all of its references in bounds. Raymond Hettinger <python@rcn.com> parents: 34622 diff changeset	714
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	715 /* Mapping to new jump targets after NOPs are removed */
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	716 addrmap = (int )PyMem_Malloc(codelen sizeof(int));
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	717 if (addrmap == NULL)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	718 goto exitUnchanged;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	719
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	720 blocks = markblocks(codestr, codelen);
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	721 if (blocks == NULL)
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	722 goto exitUnchanged;
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	723 assert(PyList_Check(consts));
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	724
33875 24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	725 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	726 opcode = codestr[i];
33838 fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	727
fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	728 lastlc = cumlc;
fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	729 cumlc = 0;
fdce3d39bec1 SF bug #1053819: Segfault in tuple_of_constants Raymond Hettinger <python@rcn.com> parents: 33822 diff changeset	730
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	731 switch (opcode) {
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	732
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	733 /* Replace UNARY_NOT JUMP_IF_FALSE POP_TOP with
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	734 with JUMP_IF_TRUE POP_TOP */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	735 case UNARY_NOT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	736 if (codestr[i+1] != JUMP_IF_FALSE \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	737 codestr[i+4] != POP_TOP \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	738 !ISBASICBLOCK(blocks,i,5))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	739 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	740 tgt = GETJUMPTGT(codestr, (i+1));
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	741 if (codestr[tgt] != POP_TOP)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	742 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	743 j = GETARG(codestr, i+1) + 1;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	744 codestr[i] = JUMP_IF_TRUE;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	745 SETARG(codestr, i, j);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	746 codestr[i+3] = POP_TOP;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	747 codestr[i+4] = NOP;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	748 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	749
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	750 /* not a is b --> a is not b
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	751 not a in b --> a not in b
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	752 not a is not b --> a is b
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	753 not a not in b --> a in b
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	754 */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	755 case COMPARE_OP:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	756 j = GETARG(codestr, i);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	757 if (j < 6 \|\| j > 9 \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	758 codestr[i+3] != UNARY_NOT \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	759 !ISBASICBLOCK(blocks,i,4))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	760 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	761 SETARG(codestr, i, (j^1));
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	762 codestr[i+3] = NOP;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	763 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	764
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	765 /* Replace LOAD_GLOBAL/LOAD_NAME None
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	766 with LOAD_CONST None */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	767 case LOAD_NAME:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	768 case LOAD_GLOBAL:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	769 j = GETARG(codestr, i);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	770 name = PyString_AsString(PyTuple_GET_ITEM(names, j));
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	771 if (name == NULL \|\| strcmp(name, "None") != 0)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	772 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	773 for (j=0 ; j < PyList_GET_SIZE(consts) ; j++) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	774 if (PyList_GET_ITEM(consts, j) == Py_None) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	775 codestr[i] = LOAD_CONST;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	776 SETARG(codestr, i, j);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	777 cumlc = lastlc + 1;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	778 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	779 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	780 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	781 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	782
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	783 /* Skip over LOAD_CONST trueconst
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	784 JUMP_IF_FALSE xx POP_TOP */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	785 case LOAD_CONST:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	786 cumlc = lastlc + 1;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	787 j = GETARG(codestr, i);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	788 if (codestr[i+3] != JUMP_IF_FALSE \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	789 codestr[i+6] != POP_TOP \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	790 !ISBASICBLOCK(blocks,i,7) \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	791 !PyObject_IsTrue(PyList_GET_ITEM(consts, j)))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	792 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	793 memset(codestr+i, NOP, 7);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	794 cumlc = 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	795 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	796
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	797 /* Try to fold tuples of constants (includes a case for lists
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	798 which are only used for "in" and "not in" tests).
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	799 Skip over BUILD_SEQN 1 UNPACK_SEQN 1.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	800 Replace BUILD_SEQN 2 UNPACK_SEQN 2 with ROT2.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	801 Replace BUILD_SEQN 3 UNPACK_SEQN 3 with ROT3 ROT2. */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	802 case BUILD_TUPLE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	803 case BUILD_LIST:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	804 j = GETARG(codestr, i);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	805 h = i - 3 * j;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	806 if (h >= 0 &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	807 j <= lastlc &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	808 ((opcode == BUILD_TUPLE &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	809 ISBASICBLOCK(blocks, h, 3*(j+1))) \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	810 (opcode == BUILD_LIST &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	811 codestr[i+3]==COMPARE_OP &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	812 ISBASICBLOCK(blocks, h, 3*(j+2)) &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	813 (GETARG(codestr,i+3)==6 \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	814 GETARG(codestr,i+3)==7))) &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	815 tuple_of_constants(&codestr[h], j, consts)) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	816 assert(codestr[i] == LOAD_CONST);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	817 cumlc = 1;
32711 c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	818 break;
c7c9b68ddda2 Treat None as a constant. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	819 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	820 if (codestr[i+3] != UNPACK_SEQUENCE \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	821 !ISBASICBLOCK(blocks,i,6) \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	822 j != GETARG(codestr, i+3))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	823 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	824 if (j == 1) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	825 memset(codestr+i, NOP, 6);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	826 } else if (j == 2) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	827 codestr[i] = ROT_TWO;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	828 memset(codestr+i+1, NOP, 5);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	829 } else if (j == 3) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	830 codestr[i] = ROT_THREE;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	831 codestr[i+1] = ROT_TWO;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	832 memset(codestr+i+2, NOP, 4);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	833 }
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	834 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	835
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	836 /* Fold binary ops on constants.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	837 LOAD_CONST c1 LOAD_CONST c2 BINOP --> LOAD_CONST binop(c1,c2) */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	838 case BINARY_POWER:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	839 case BINARY_MULTIPLY:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	840 case BINARY_TRUE_DIVIDE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	841 case BINARY_FLOOR_DIVIDE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	842 case BINARY_MODULO:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	843 case BINARY_ADD:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	844 case BINARY_SUBTRACT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	845 case BINARY_SUBSCR:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	846 case BINARY_LSHIFT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	847 case BINARY_RSHIFT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	848 case BINARY_AND:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	849 case BINARY_XOR:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	850 case BINARY_OR:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	851 if (lastlc >= 2 &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	852 ISBASICBLOCK(blocks, i-6, 7) &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	853 fold_binops_on_constants(&codestr[i-6], consts)) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	854 i -= 2;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	855 assert(codestr[i] == LOAD_CONST);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	856 cumlc = 1;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	857 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	858 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	859
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	860 /* Fold unary ops on constants.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	861 LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	862 case UNARY_NEGATIVE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	863 case UNARY_CONVERT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	864 case UNARY_INVERT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	865 if (lastlc >= 1 &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	866 ISBASICBLOCK(blocks, i-3, 4) &&
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	867 fold_unaryops_on_constants(&codestr[i-3], consts)) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	868 i -= 2;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	869 assert(codestr[i] == LOAD_CONST);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	870 cumlc = 1;
33259 b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	871 }
b63b30821ef4 Simplify chains of conditional jumps. Raymond Hettinger <python@rcn.com> parents: 33249 diff changeset	872 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	873
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	874 /* Simplify conditional jump to conditional jump where the
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	875 result of the first test implies the success of a similar
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	876 test or the failure of the opposite test.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	877 Arises in code like:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	878 "if a and b:"
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	879 "if a or b:"
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	880 "a and b or c"
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	881 "(a and b) and c"
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	882 x:JUMP_IF_FALSE y y:JUMP_IF_FALSE z --> x:JUMP_IF_FALSE z
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	883 x:JUMP_IF_FALSE y y:JUMP_IF_TRUE z --> x:JUMP_IF_FALSE y+3
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	884 where y+3 is the instruction following the second test.
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	885 */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	886 case JUMP_IF_FALSE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	887 case JUMP_IF_TRUE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	888 tgt = GETJUMPTGT(codestr, i);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	889 j = codestr[tgt];
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	890 if (j == JUMP_IF_FALSE \|\| j == JUMP_IF_TRUE) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	891 if (j == opcode) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	892 tgttgt = GETJUMPTGT(codestr, tgt) - i - 3;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	893 SETARG(codestr, i, tgttgt);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	894 } else {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	895 tgt -= i;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	896 SETARG(codestr, i, tgt);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	897 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	898 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	899 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	900 /* Intentional fallthrough */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	901
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	902 /* Replace jumps to unconditional jumps */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	903 case FOR_ITER:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	904 case JUMP_FORWARD:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	905 case JUMP_ABSOLUTE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	906 case CONTINUE_LOOP:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	907 case SETUP_LOOP:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	908 case SETUP_EXCEPT:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	909 case SETUP_FINALLY:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	910 tgt = GETJUMPTGT(codestr, i);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	911 if (!UNCONDITIONAL_JUMP(codestr[tgt]))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	912 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	913 tgttgt = GETJUMPTGT(codestr, tgt);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	914 if (opcode == JUMP_FORWARD) /* JMP_ABS can go backwards */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	915 opcode = JUMP_ABSOLUTE;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	916 if (!ABSOLUTE_JUMP(opcode))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	917 tgttgt -= i + 3; /* Calc relative jump addr */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	918 if (tgttgt < 0) /* No backward relative jumps */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	919 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	920 codestr[i] = opcode;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	921 SETARG(codestr, i, tgttgt);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	922 break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	923
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	924 case EXTENDED_ARG:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	925 goto exitUnchanged;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	926
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	927 /* Replace RETURN LOAD_CONST None RETURN with just RETURN */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	928 case RETURN_VALUE:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	929 if (i+4 >= codelen \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	930 codestr[i+4] != RETURN_VALUE \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	931 !ISBASICBLOCK(blocks,i,5))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	932 continue;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	933 memset(codestr+i+1, NOP, 4);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	934 break;
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	935 }
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	936 }
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	937
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	938 /* Fixup linenotab */
33875 24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	939 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	940 addrmap[i] = i - nops;
24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	941 if (codestr[i] == NOP)
24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	942 nops++;
24fc3eaa19e0 Simplify and future proof NOP counting in the peepholer. Raymond Hettinger <python@rcn.com> parents: 33861 diff changeset	943 }
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	944 cum_orig_line = 0;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	945 last_line = 0;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	946 for (i=0 ; i < tabsiz ; i+=2) {
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	947 cum_orig_line += lineno[i];
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	948 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	949 assert (new_line - last_line < 255);
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	950 lineno[i] =((unsigned char)(new_line - last_line));
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	951 last_line = new_line;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	952 }
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	953
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	954 /* Remove NOPs and fixup jump targets */
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	955 for (i=0, h=0 ; i<codelen ; ) {
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	956 opcode = codestr[i];
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	957 switch (opcode) {
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	958 case NOP:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	959 i++;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	960 continue;
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 case JUMP_ABSOLUTE:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	963 case CONTINUE_LOOP:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	964 j = addrmap[GETARG(codestr, i)];
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	965 SETARG(codestr, i, j);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	966 break;
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 case FOR_ITER:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	969 case JUMP_FORWARD:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	970 case JUMP_IF_FALSE:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	971 case JUMP_IF_TRUE:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	972 case SETUP_LOOP:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	973 case SETUP_EXCEPT:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	974 case SETUP_FINALLY:
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	975 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	976 SETARG(codestr, i, j);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	977 break;
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	978 }
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	979 adj = CODESIZE(opcode);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	980 while (adj--)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	981 codestr[h++] = codestr[i++];
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	982 }
33249 c654334dc961 Incorporate review comments courtesy of Neal Norwitz: Raymond Hettinger <python@rcn.com> parents: 33248 diff changeset	983 assert(h + nops == codelen);
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	984
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	985 code = PyString_FromStringAndSize((char *)codestr, h);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	986 PyMem_Free(addrmap);
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	987 PyMem_Free(codestr);
31728 6509354e7876 Improve byte coding for multiple assignments. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	988 PyMem_Free(blocks);
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	989 return code;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	990
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	991 exitUnchanged:
33860 3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	992 if (blocks != NULL)
3467288089a1 Adopt some peepholer suggestions from Armin Rigo: Raymond Hettinger <python@rcn.com> parents: 33838 diff changeset	993 PyMem_Free(blocks);
33248 1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	994 if (addrmap != NULL)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	995 PyMem_Free(addrmap);
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	996 if (codestr != NULL)
1f9b9c226b43 SF Patch #1013667: Cleanup Peepholer Output Raymond Hettinger <python@rcn.com> parents: 33169 diff changeset	997 PyMem_Free(codestr);
28406 733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	998 Py_INCREF(code);
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	999 return code;
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	1000 }
733729261c41 SF patch #707257: Improve code generation Raymond Hettinger <python@rcn.com> parents: 28402 diff changeset	1001
33539 2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	1002 /* End: Peephole optimizations ----------------------------------------- */
2b49b4a85d9e SF patch #1031667: Fold tuples of constants into a single constant Raymond Hettinger <python@rcn.com> parents: 33353 diff changeset	1003
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1004 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1005
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1006 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	1007
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1008 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1009 compiler_display_symbols(PyObject name, PyObject symbols)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1010 {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1011 PyObject key, value;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1012 int flags;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1013 Py_ssize_t pos = 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1014
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1015 fprintf(stderr, "block %s\n", PyString_AS_STRING(name));
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1016 while (PyDict_Next(symbols, &pos, &key, &value)) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1017 flags = PyInt_AsLong(value);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1018 fprintf(stderr, "var %s:", PyString_AS_STRING(key));
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1019 if (flags & DEF_GLOBAL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1020 fprintf(stderr, " declared_global");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1021 if (flags & DEF_LOCAL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1022 fprintf(stderr, " local");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1023 if (flags & DEF_PARAM)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1024 fprintf(stderr, " param");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1025 if (flags & DEF_STAR)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1026 fprintf(stderr, " stararg");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1027 if (flags & DEF_DOUBLESTAR)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1028 fprintf(stderr, " starstar");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1029 if (flags & DEF_INTUPLE)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1030 fprintf(stderr, " tuple");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1031 if (flags & DEF_FREE)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1032 fprintf(stderr, " free");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1033 if (flags & DEF_FREE_GLOBAL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1034 fprintf(stderr, " global");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1035 if (flags & DEF_FREE_CLASS)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1036 fprintf(stderr, " free/class");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1037 if (flags & DEF_IMPORT)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1038 fprintf(stderr, " import");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1039 fprintf(stderr, "\n");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1040 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1041 fprintf(stderr, "\n");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1042 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1043 */
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 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1046 compiler_unit_check(struct compiler_unit *u)
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 basicblock *block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1049 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	1050 assert(block != (void *)0xcbcbcbcb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1051 assert(block != (void *)0xfbfbfbfb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1052 assert(block != (void *)0xdbdbdbdb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1053 if (block->b_instr != NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1054 assert(block->b_ialloc > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1055 assert(block->b_iused > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1056 assert(block->b_ialloc >= block->b_iused);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1057 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1058 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1059 assert (block->b_iused == 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1060 assert (block->b_ialloc == 0);
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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1063 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1064
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1065 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1066 compiler_unit_free(struct compiler_unit *u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1067 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1068 basicblock b, next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1069
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1070 compiler_unit_check(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1071 b = u->u_blocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1072 while (b != NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1073 if (b->b_instr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1074 PyObject_Free((void *)b->b_instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1075 next = b->b_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1076 PyObject_Free((void *)b);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1077 b = next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1078 }
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1079 Py_CLEAR(u->u_ste);
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1080 Py_CLEAR(u->u_name);
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1081 Py_CLEAR(u->u_consts);
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1082 Py_CLEAR(u->u_names);
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1083 Py_CLEAR(u->u_varnames);
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1084 Py_CLEAR(u->u_freevars);
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1085 Py_CLEAR(u->u_cellvars);
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1086 Py_CLEAR(u->u_private);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1087 PyObject_Free(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1088 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1089
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1090 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1091 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	1092 int lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1093 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1094 struct compiler_unit *u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1095
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1096 u = (struct compiler_unit *)PyObject_Malloc(sizeof(
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1097 struct compiler_unit));
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1098 if (!u) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1099 PyErr_NoMemory();
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1100 return 0;
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1101 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1102 memset(u, 0, sizeof(struct compiler_unit));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1103 u->u_argcount = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1104 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	1105 if (!u->u_ste) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1106 compiler_unit_free(u);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1107 return 0;
35742 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 Py_INCREF(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1110 u->u_name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1111 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	1112 u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0);
39131 7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1113 if (!u->u_varnames \|\| !u->u_cellvars) {
7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1114 compiler_unit_free(u);
7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1115 return 0;
7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1116 }
7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1117
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1118 u->u_freevars = dictbytype(u->u_ste->ste_symbols, FREE, DEF_FREE_CLASS,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1119 PyDict_Size(u->u_cellvars));
39131 7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1120 if (!u->u_freevars) {
7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1121 compiler_unit_free(u);
7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1122 return 0;
7c09b66f04bd Handle more memory allocation failures without crashing. Neal Norwitz <nnorwitz@gmail.com> parents: 39094 diff changeset	1123 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1124
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1125 u->u_blocks = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1126 u->u_tmpname = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1127 u->u_nfblocks = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1128 u->u_firstlineno = lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1129 u->u_lineno = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1130 u->u_lineno_set = false;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1131 u->u_consts = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1132 if (!u->u_consts) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1133 compiler_unit_free(u);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1134 return 0;
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 u->u_names = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1137 if (!u->u_names) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1138 compiler_unit_free(u);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1139 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1140 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1141
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1142 u->u_private = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1143
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1144 /* Push the old compiler_unit on the stack. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1145 if (c->u) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1146 PyObject *wrapper = PyCObject_FromVoidPtr(c->u, NULL);
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1147 if (!wrapper \|\| PyList_Append(c->c_stack, wrapper) < 0) {
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1148 Py_XDECREF(wrapper);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1149 compiler_unit_free(u);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1150 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1151 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1152 Py_DECREF(wrapper);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1153 u->u_private = c->u->u_private;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1154 Py_XINCREF(u->u_private);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1155 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1156 c->u = u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1157
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1158 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	1159 if (compiler_use_new_block(c) == NULL)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1160 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1161
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1162 return 1;
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
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1165 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1166 compiler_exit_scope(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1167 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1168 int n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1169 PyObject *wrapper;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1170
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1171 c->c_nestlevel--;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1172 compiler_unit_free(c->u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1173 /* Restore c->u to the parent unit. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1174 n = PyList_GET_SIZE(c->c_stack) - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1175 if (n >= 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1176 wrapper = PyList_GET_ITEM(c->c_stack, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1177 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	1178 /* 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	1179 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	1180 Py_FatalError("compiler_exit_scope()");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1181 compiler_unit_check(c->u);
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 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1184 c->u = NULL;
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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1187
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1188 /* Allocate a new "anonymous" local variable.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1189 Used by list comprehensions and with statements.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1190 */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1191
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1192 static PyObject *
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1193 compiler_new_tmpname(struct compiler *c)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1194 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1195 char tmpname[256];
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1196 PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]", ++c->u->u_tmpname);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1197 return PyString_FromString(tmpname);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1198 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1199
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1200 /* 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	1201 Returns NULL on error.
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_new_block(struct compiler *c)
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 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1208 struct compiler_unit *u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1209
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1210 u = c->u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1211 b = (basicblock *)PyObject_Malloc(sizeof(basicblock));
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1212 if (b == NULL) {
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1213 PyErr_NoMemory();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1214 return NULL;
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1215 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1216 memset((void *)b, 0, sizeof(basicblock));
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1217 /* Extend the singly linked list of blocks with new block. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1218 b->b_list = u->u_blocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1219 u->u_blocks = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1220 return b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1221 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1222
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1223 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1224 compiler_use_new_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1225 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1226 basicblock *block = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1227 if (block == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1228 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1229 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1230 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1231 }
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 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1234 compiler_next_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1235 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1236 basicblock *block = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1237 if (block == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1238 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1239 c->u->u_curblock->b_next = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1240 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1241 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1242 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1243
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1244 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1245 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	1246 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1247 assert(block != NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1248 c->u->u_curblock->b_next = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1249 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1250 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1251 }
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 /* 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	1254 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	1255 Returns -1 on failure.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1256 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1257
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1258 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1259 compiler_next_instr(struct compiler c, basicblock b)
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 assert(b != NULL);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1262 if (b->b_instr == NULL) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1263 b->b_instr = (struct instr *)PyObject_Malloc(
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1264 sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1265 if (b->b_instr == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1266 PyErr_NoMemory();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1267 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1268 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1269 b->b_ialloc = DEFAULT_BLOCK_SIZE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1270 memset((char *)b->b_instr, 0,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1271 sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1272 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1273 else if (b->b_iused == b->b_ialloc) {
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1274 struct instr *tmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1275 size_t oldsize, newsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1276 oldsize = b->b_ialloc * sizeof(struct instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1277 newsize = oldsize << 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1278 if (newsize == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1279 PyErr_NoMemory();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1280 return -1;
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 b->b_ialloc <<= 1;
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1283 tmp = (struct instr *)PyObject_Realloc(
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1284 (void *)b->b_instr, newsize);
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1285 if (tmp == NULL) {
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1286 PyErr_NoMemory();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1287 return -1;
39135 12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1288 }
12e973bdfeee Fix more memory allocation issues found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 39131 diff changeset	1289 b->b_instr = tmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1290 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	1291 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1292 return b->b_iused++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1293 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1294
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1295 /* Set the i_lineno member of the instruction at offse off if the
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1296 line number for the current expression/statement (?) has not
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1297 already been set. If it has been set, the call has no effect.
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1298
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1299 Every time a new node is b
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1300 */
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1301
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1302 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1303 compiler_set_lineno(struct compiler *c, int off)
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 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1306 if (c->u->u_lineno_set)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1307 return;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1308 c->u->u_lineno_set = true;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1309 b = c->u->u_curblock;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1310 b->b_instr[off].i_lineno = c->u->u_lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1311 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1312
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1313 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1314 opcode_stack_effect(int opcode, int oparg)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1315 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1316 switch (opcode) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1317 case POP_TOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1318 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1319 case ROT_TWO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1320 case ROT_THREE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1321 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1322 case DUP_TOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1323 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1324 case ROT_FOUR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1325 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1326
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1327 case UNARY_POSITIVE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1328 case UNARY_NEGATIVE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1329 case UNARY_NOT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1330 case UNARY_CONVERT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1331 case UNARY_INVERT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1332 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1333
36824 07f330ad1b47 SF bug 1442442: LIST_APPEND optimization got lost in the AST merge. Neal Norwitz <nnorwitz@gmail.com> parents: 36804 diff changeset	1334 case LIST_APPEND:
07f330ad1b47 SF bug 1442442: LIST_APPEND optimization got lost in the AST merge. Neal Norwitz <nnorwitz@gmail.com> parents: 36804 diff changeset	1335 return -2;
07f330ad1b47 SF bug 1442442: LIST_APPEND optimization got lost in the AST merge. Neal Norwitz <nnorwitz@gmail.com> parents: 36804 diff changeset	1336
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1337 case BINARY_POWER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1338 case BINARY_MULTIPLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1339 case BINARY_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1340 case BINARY_MODULO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1341 case BINARY_ADD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1342 case BINARY_SUBTRACT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1343 case BINARY_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1344 case BINARY_FLOOR_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1345 case BINARY_TRUE_DIVIDE:
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 INPLACE_FLOOR_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1348 case INPLACE_TRUE_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1349 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1350
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1351 case SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1352 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1353 case SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1354 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1355 case SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1356 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1357 case SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1358 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1359
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1360 case STORE_SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1361 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1362 case STORE_SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1363 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1364 case STORE_SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1365 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1366 case STORE_SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1367 return -4;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1368
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1369 case DELETE_SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1370 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1371 case DELETE_SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1372 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1373 case DELETE_SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1374 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1375 case DELETE_SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1376 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1377
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1378 case INPLACE_ADD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1379 case INPLACE_SUBTRACT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1380 case INPLACE_MULTIPLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1381 case INPLACE_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1382 case INPLACE_MODULO:
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 STORE_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1385 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1386 case DELETE_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1387 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1388
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1389 case BINARY_LSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1390 case BINARY_RSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1391 case BINARY_AND:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1392 case BINARY_XOR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1393 case BINARY_OR:
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 INPLACE_POWER:
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 GET_ITER:
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1400 case PRINT_EXPR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1401 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1402 case PRINT_ITEM:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1403 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1404 case PRINT_NEWLINE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1405 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1406 case PRINT_ITEM_TO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1407 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1408 case PRINT_NEWLINE_TO:
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 INPLACE_LSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1411 case INPLACE_RSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1412 case INPLACE_AND:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1413 case INPLACE_XOR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1414 case INPLACE_OR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1415 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1416 case BREAK_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1417 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	1418 case WITH_CLEANUP:
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36824 diff changeset	1419 return -1; /* XXX Sometimes more */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1420 case LOAD_LOCALS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1421 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1422 case RETURN_VALUE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1423 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1424 case IMPORT_STAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1425 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1426 case EXEC_STMT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1427 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1428 case YIELD_VALUE:
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1431 case POP_BLOCK:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1432 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1433 case END_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1434 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	1435 case BUILD_CLASS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1436 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1437
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1438 case STORE_NAME:
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_NAME:
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 case UNPACK_SEQUENCE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1443 return oparg-1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1444 case FOR_ITER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1445 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1446
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1447 case STORE_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1448 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1449 case DELETE_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1450 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1451 case STORE_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1452 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1453 case DELETE_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1454 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1455 case DUP_TOPX:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1456 return oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1457 case LOAD_CONST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1458 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1459 case LOAD_NAME:
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 case BUILD_TUPLE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1462 case BUILD_LIST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1463 return 1-oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1464 case BUILD_MAP:
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_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1467 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1468 case COMPARE_OP:
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 case IMPORT_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1471 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1472 case IMPORT_FROM:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1473 return 1;
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 case JUMP_FORWARD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1476 case JUMP_IF_FALSE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1477 case JUMP_IF_TRUE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1478 case JUMP_ABSOLUTE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1479 return 0;
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 case LOAD_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1482 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1483
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1484 case CONTINUE_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1485 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1486 case SETUP_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1487 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1488 case SETUP_EXCEPT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1489 case SETUP_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1490 return 3; /* actually pushed by an exception */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1491
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1492 case LOAD_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1493 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1494 case STORE_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1495 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1496 case DELETE_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1497 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1498
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1499 case RAISE_VARARGS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1500 return -oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1501 #define NARGS(o) (((o) % 256) + 2*((o) / 256))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1502 case CALL_FUNCTION:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1503 return -NARGS(oparg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1504 case CALL_FUNCTION_VAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1505 case CALL_FUNCTION_KW:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1506 return -NARGS(oparg)-1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1507 case CALL_FUNCTION_VAR_KW:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1508 return -NARGS(oparg)-2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1509 #undef NARGS
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1510 case MAKE_FUNCTION:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1511 return -oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1512 case BUILD_SLICE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1513 if (oparg == 3)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1514 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1515 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1516 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1517
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1518 case MAKE_CLOSURE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1519 return -oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1520 case LOAD_CLOSURE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1521 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1522 case LOAD_DEREF:
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 case STORE_DEREF:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1525 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1526 default:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1527 fprintf(stderr, "opcode = %d\n", opcode);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1528 Py_FatalError("opcode_stack_effect()");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1529
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1530 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1531 return 0; /* not reachable */
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1534 /* Add an opcode with no argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1535 Returns 0 on failure, 1 on success.
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1538 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1539 compiler_addop(struct compiler *c, int opcode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1540 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1541 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1542 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1543 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1544 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	1545 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1546 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1547 b = c->u->u_curblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1548 i = &b->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1549 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1550 i->i_hasarg = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1551 if (opcode == RETURN_VALUE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1552 b->b_return = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1553 compiler_set_lineno(c, off);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1554 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1555 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1558 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	1559 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1560 PyObject t, v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	1561 Py_ssize_t arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1562
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1563 /* necessary to make sure types aren't coerced (e.g., int and long) */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1564 t = PyTuple_Pack(2, o, o->ob_type);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1565 if (t == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1566 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1567
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1568 v = PyDict_GetItem(dict, t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1569 if (!v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1570 arg = PyDict_Size(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1571 v = PyInt_FromLong(arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1572 if (!v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1573 Py_DECREF(t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1574 return -1;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1575 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1576 if (PyDict_SetItem(dict, t, v) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1577 Py_DECREF(t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1578 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1579 return -1;
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 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1582 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1583 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1584 arg = PyInt_AsLong(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1585 Py_DECREF(t);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1586 return arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1587 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1588
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1589 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1590 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	1591 PyObject *o)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1592 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1593 int arg = compiler_add_o(c, dict, o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1594 if (arg < 0)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1595 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1596 return compiler_addop_i(c, opcode, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1597 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1600 compiler_addop_name(struct compiler c, int opcode, PyObject dict,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1601 PyObject *o)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1602 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1603 int arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1604 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	1605 if (!mangled)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1606 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1607 arg = compiler_add_o(c, dict, mangled);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1608 Py_DECREF(mangled);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1609 if (arg < 0)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1610 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1611 return compiler_addop_i(c, opcode, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1612 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1613
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1614 /* Add an opcode with an integer argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1615 Returns 0 on failure, 1 on success.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1616 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1617
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1618 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1619 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	1620 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1621 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1622 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1623 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	1624 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1625 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1626 i = &c->u->u_curblock->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1627 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1628 i->i_oparg = oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1629 i->i_hasarg = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1630 compiler_set_lineno(c, off);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1631 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1632 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1633
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1634 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1635 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	1636 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1637 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1638 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1639
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1640 assert(b != NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1641 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	1642 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1643 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1644 i = &c->u->u_curblock->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1645 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1646 i->i_target = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1647 i->i_hasarg = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1648 if (absolute)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1649 i->i_jabs = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1650 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1651 i->i_jrel = 1;
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	1652 compiler_set_lineno(c, off);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1653 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1654 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1655
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1656 /* The distinction between NEW_BLOCK and NEXT_BLOCK is subtle. (I'd
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1657 like to find better names.) NEW_BLOCK() creates a new block and sets
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1658 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	1659 from the current block to the new block.
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 /* 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	1663 objects created in the local function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1664 */
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1667 #define NEW_BLOCK(C) { \
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1668 if (compiler_use_new_block((C)) == NULL) \
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1669 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1670 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1671
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1672 #define NEXT_BLOCK(C) { \
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1673 if (compiler_next_block((C)) == NULL) \
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1674 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1675 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1676
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1677 #define ADDOP(C, OP) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1678 if (!compiler_addop((C), (OP))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1679 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1680 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1681
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1682 #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	1683 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	1684 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	1685 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1686 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1687 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1688
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1689 #define ADDOP_O(C, OP, O, TYPE) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1690 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	1691 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1692 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1693
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1694 #define ADDOP_NAME(C, OP, O, TYPE) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1695 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	1696 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1697 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1698
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1699 #define ADDOP_I(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1700 if (!compiler_addop_i((C), (OP), (O))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1701 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1702 }
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 #define ADDOP_JABS(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1705 if (!compiler_addop_j((C), (OP), (O), 1)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1706 return 0; \
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 #define ADDOP_JREL(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1710 if (!compiler_addop_j((C), (OP), (O), 0)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1711 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1712 }
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 /* 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	1715 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	1716 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1717
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1718 #define VISIT(C, TYPE, V) {\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1719 if (!compiler_visit_ ## TYPE((C), (V))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1720 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1721 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1722
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1723 #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	1724 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	1725 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	1726 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1727 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1728 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1729
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1730 #define VISIT_SLICE(C, V, CTX) {\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1731 if (!compiler_visit_slice((C), (V), (CTX))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1732 return 0; \
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1735 #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	1736 int _i; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1737 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	1738 for (_i = 0; _i < asdl_seq_LEN(seq); _i++) { \
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	1739 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, _i); \
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1740 if (!compiler_visit_ ## TYPE((C), elt)) \
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1741 return 0; \
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1742 } \
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1743 }
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1744
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1745 #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	1746 int _i; \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1747 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	1748 for (_i = 0; _i < asdl_seq_LEN(seq); _i++) { \
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	1749 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, _i); \
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1750 if (!compiler_visit_ ## TYPE((C), elt)) { \
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1751 compiler_exit_scope(c); \
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1752 return 0; \
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1753 } \
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1754 } \
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1755 }
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1756
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1757 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1758 compiler_isdocstring(stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1759 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1760 if (s->kind != Expr_kind)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1761 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1762 return s->v.Expr.value->kind == Str_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1763 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1764
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1765 /* 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	1766
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1767 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1768 compiler_body(struct compiler c, asdl_seq stmts)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1769 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1770 int i = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1771 stmt_ty st;
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 if (!asdl_seq_LEN(stmts))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1774 return 1;
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1775 st = (stmt_ty)asdl_seq_GET(stmts, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1776 if (compiler_isdocstring(st)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1777 i = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1778 VISIT(c, expr, st->v.Expr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1779 if (!compiler_nameop(c, __doc__, Store))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1780 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1781 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1782 for (; i < asdl_seq_LEN(stmts); i++)
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1783 VISIT(c, stmt, (stmt_ty)asdl_seq_GET(stmts, i));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1784 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1785 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1786
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1787 static PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1788 compiler_mod(struct compiler *c, mod_ty mod)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1789 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1790 PyCodeObject *co;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1791 int addNone = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1792 static PyObject *module;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1793 if (!module) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1794 module = PyString_FromString("<module>");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1795 if (!module)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1796 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1797 }
39040 ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	1798 /* Use 0 for firstlineno initially, will fixup in assemble(). */
ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	1799 if (!compiler_enter_scope(c, module, mod, 0))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1800 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1801 switch (mod->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1802 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	1803 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	1804 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1805 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	1806 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1807 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1808 case Interactive_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1809 c->c_interactive = 1;
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	1810 VISIT_SEQ_IN_SCOPE(c, stmt,
72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	1811 mod->v.Interactive.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1812 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1813 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	1814 VISIT_IN_SCOPE(c, expr, mod->v.Expression.body);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1815 addNone = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1816 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1817 case Suite_kind:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1818 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1819 "suite should not be possible");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1820 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1821 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1822 PyErr_Format(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1823 "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	1824 mod->kind);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1825 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1826 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1827 co = assemble(c, addNone);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1828 compiler_exit_scope(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1829 return co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1830 }
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 /* 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	1833 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	1834 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	1835 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1836
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1837 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1838 get_ref_type(struct compiler c, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1839 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1840 int scope = PyST_GetScope(c->u->u_ste, name);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1841 if (scope == 0) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1842 char buf[350];
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1843 PyOS_snprintf(buf, sizeof(buf),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1844 "unknown scope for %.100s in %.100s(%s) in %s\n"
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1845 "symbols: %s\nlocals: %s\nglobals: %s\n",
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1846 PyString_AS_STRING(name),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1847 PyString_AS_STRING(c->u->u_name),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1848 PyObject_REPR(c->u->u_ste->ste_id),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1849 c->c_filename,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1850 PyObject_REPR(c->u->u_ste->ste_symbols),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1851 PyObject_REPR(c->u->u_varnames),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1852 PyObject_REPR(c->u->u_names)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1853 );
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1854 Py_FatalError(buf);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1855 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1856
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1857 return scope;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1858 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1861 compiler_lookup_arg(PyObject dict, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1862 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1863 PyObject k, v;
38406 8f7c7aeac3a5 Replace Py_BuildValue("OO") by PyTuple_Pack. Georg Brandl <georg@python.org> parents: 38084 diff changeset	1864 k = PyTuple_Pack(2, name, name->ob_type);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1865 if (k == NULL)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1866 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1867 v = PyDict_GetItem(dict, k);
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 35895 diff changeset	1868 Py_DECREF(k);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1869 if (v == NULL)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1870 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1871 return PyInt_AS_LONG(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1872 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1875 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	1876 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1877 int i, free = PyCode_GetNumFree(co);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1878 if (free == 0) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1879 ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1880 ADDOP_I(c, MAKE_FUNCTION, args);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1881 return 1;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1882 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1883 for (i = 0; i < free; ++i) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1884 /* Bypass com_addop_varname because it will generate
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1885 LOAD_DEREF but LOAD_CLOSURE is needed.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1886 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1887 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	1888 int arg, reftype;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1889
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1890 /* 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	1891 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	1892 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	1893 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	1894 well as by the normal name loookup logic.
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 reftype = get_ref_type(c, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1897 if (reftype == CELL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1898 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	1899 else /* (reftype == FREE) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1900 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	1901 if (arg == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1902 printf("lookup %s in %s %d %d\n"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1903 "freevars of %s: %s\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1904 PyObject_REPR(name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1905 PyString_AS_STRING(c->u->u_name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1906 reftype, arg,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1907 PyString_AS_STRING(co->co_name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1908 PyObject_REPR(co->co_freevars));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1909 Py_FatalError("compiler_make_closure()");
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 ADDOP_I(c, LOAD_CLOSURE, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1912 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1913 ADDOP_I(c, BUILD_TUPLE, free);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1914 ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1915 ADDOP_I(c, MAKE_CLOSURE, args);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1916 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1917 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1920 compiler_decorators(struct compiler c, asdl_seq decos)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1921 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1922 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1923
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1924 if (!decos)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1925 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1926
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1927 for (i = 0; i < asdl_seq_LEN(decos); i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1928 VISIT(c, expr, (expr_ty)asdl_seq_GET(decos, i));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1929 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1930 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1931 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1932
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1933 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1934 compiler_arguments(struct compiler *c, arguments_ty args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1935 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1936 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1937 int n = asdl_seq_LEN(args->args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1938 /* Correctly handle nested argument lists */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1939 for (i = 0; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1940 expr_ty arg = (expr_ty)asdl_seq_GET(args->args, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1941 if (arg->kind == Tuple_kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1942 PyObject *id = PyString_FromFormat(".%d", i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1943 if (id == 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 if (!compiler_nameop(c, id, Load)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1947 Py_DECREF(id);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1948 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1949 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1950 Py_DECREF(id);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1951 VISIT(c, expr, arg);
35742 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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1954 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1957 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1958 compiler_function(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1959 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1960 PyCodeObject *co;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1961 PyObject *first_const = Py_None;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1962 arguments_ty args = s->v.FunctionDef.args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1963 asdl_seq* decos = s->v.FunctionDef.decorators;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1964 stmt_ty st;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1965 int i, n, docstring;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1966
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1967 assert(s->kind == FunctionDef_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1968
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1969 if (!compiler_decorators(c, decos))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1970 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1971 if (args->defaults)
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	1972 VISIT_SEQ(c, expr, args->defaults);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1973 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	1974 s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1975 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1976
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1977 st = (stmt_ty)asdl_seq_GET(s->v.FunctionDef.body, 0);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1978 docstring = compiler_isdocstring(st);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1979 if (docstring)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1980 first_const = st->v.Expr.value->v.Str.s;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1981 if (compiler_add_o(c, c->u->u_consts, first_const) < 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	1982 compiler_exit_scope(c);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1983 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	1984 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1985
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1986 /* unpack nested arguments */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1987 compiler_arguments(c, args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1988
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1989 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	1990 n = asdl_seq_LEN(s->v.FunctionDef.body);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1991 /* if there was a docstring, we need to skip the first statement */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1992 for (i = docstring; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	1993 stmt_ty s2 = (stmt_ty)asdl_seq_GET(s->v.FunctionDef.body, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1994 if (i == 0 && s2->kind == Expr_kind &&
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1995 s2->v.Expr.value->kind == Str_kind)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1996 continue;
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1997 VISIT_IN_SCOPE(c, stmt, s2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1998 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1999 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	2000 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2001 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2002 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2003
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2004 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	2005 Py_DECREF(co);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2006
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2007 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	2008 ADDOP_I(c, CALL_FUNCTION, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2009 }
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 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	2012 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2013
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2014 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2015 compiler_class(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2016 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2017 int n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2018 PyCodeObject *co;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2019 PyObject *str;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2020 /* 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	2021 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	2022 /* 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	2023 n = asdl_seq_LEN(s->v.ClassDef.bases);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2024 if (n > 0)
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2025 VISIT_SEQ(c, expr, s->v.ClassDef.bases);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2026 ADDOP_I(c, BUILD_TUPLE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2027 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	2028 s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2029 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2030 c->u->u_private = s->v.ClassDef.name;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2031 Py_INCREF(c->u->u_private);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2032 str = PyString_InternFromString("__name__");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2033 if (!str \|\| !compiler_nameop(c, str, Load)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2034 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	2035 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2036 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2037 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2038
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2039 Py_DECREF(str);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2040 str = PyString_InternFromString("__module__");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2041 if (!str \|\| !compiler_nameop(c, str, Store)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2042 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	2043 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2044 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2045 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2046 Py_DECREF(str);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2047
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	2048 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	2049 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2050 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	2051 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2052
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	2053 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	2054 ADDOP_IN_SCOPE(c, RETURN_VALUE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2055 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	2056 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2057 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2058 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2059
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2060 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	2061 Py_DECREF(co);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2062
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2063 ADDOP_I(c, CALL_FUNCTION, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2064 ADDOP(c, BUILD_CLASS);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2065 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	2066 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2067 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2070 static int
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2071 compiler_ifexp(struct compiler *c, expr_ty e)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2072 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2073 basicblock end, next;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2074
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2075 assert(e->kind == IfExp_kind);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2076 end = compiler_new_block(c);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2077 if (end == NULL)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2078 return 0;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2079 next = compiler_new_block(c);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2080 if (next == NULL)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2081 return 0;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2082 VISIT(c, expr, e->v.IfExp.test);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2083 ADDOP_JREL(c, JUMP_IF_FALSE, next);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2084 ADDOP(c, POP_TOP);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2085 VISIT(c, expr, e->v.IfExp.body);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2086 ADDOP_JREL(c, JUMP_FORWARD, end);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2087 compiler_use_next_block(c, next);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2088 ADDOP(c, POP_TOP);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2089 VISIT(c, expr, e->v.IfExp.orelse);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2090 compiler_use_next_block(c, end);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2091 return 1;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2092 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2093
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2094 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2095 compiler_lambda(struct compiler *c, expr_ty e)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2096 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	2097 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	2098 static identifier name;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2099 arguments_ty args = e->v.Lambda.args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2100 assert(e->kind == Lambda_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2101
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2102 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	2103 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	2104 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	2105 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	2106 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2107
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2108 if (args->defaults)
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2109 VISIT_SEQ(c, expr, args->defaults);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2110 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	2111 return 0;
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2112
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2113 /* unpack nested arguments */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2114 compiler_arguments(c, args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2115
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2116 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	2117 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	2118 ADDOP_IN_SCOPE(c, RETURN_VALUE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2119 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	2120 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2121 if (co == NULL)
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
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2124 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	2125 Py_DECREF(co);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2126
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2127 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2128 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2129
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2130 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2131 compiler_print(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2132 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2133 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2134 bool dest;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2135
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2136 assert(s->kind == Print_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2137 n = asdl_seq_LEN(s->v.Print.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2138 dest = false;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2139 if (s->v.Print.dest) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2140 VISIT(c, expr, s->v.Print.dest);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2141 dest = true;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2142 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2143 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2144 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	2145 if (dest) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2146 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2147 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2148 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2149 ADDOP(c, PRINT_ITEM_TO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2150 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2151 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2152 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2153 ADDOP(c, PRINT_ITEM);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2154 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2155 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2156 if (s->v.Print.nl) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2157 if (dest)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2158 ADDOP(c, PRINT_NEWLINE_TO)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2159 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2160 ADDOP(c, PRINT_NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2161 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2162 else if (dest)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2163 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2164 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2165 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2166
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2167 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2168 compiler_if(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2169 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2170 basicblock end, next;
38588 5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2171 int constant;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2172 assert(s->kind == If_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2173 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2174 if (end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2175 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2176 next = compiler_new_block(c);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2177 if (next == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2178 return 0;
38588 5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2179
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2180 constant = expr_constant(s->v.If.test);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2181 /* constant = 0: "if 0"
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2182 * constant = 1: "if 1", "if 2", ...
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2183 * constant = -1: rest */
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2184 if (constant == 0) {
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2185 if (s->v.If.orelse)
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2186 VISIT_SEQ(c, stmt, s->v.If.orelse);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2187 } else if (constant == 1) {
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2188 VISIT_SEQ(c, stmt, s->v.If.body);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2189 } else {
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2190 VISIT(c, expr, s->v.If.test);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2191 ADDOP_JREL(c, JUMP_IF_FALSE, next);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2192 ADDOP(c, POP_TOP);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2193 VISIT_SEQ(c, stmt, s->v.If.body);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2194 ADDOP_JREL(c, JUMP_FORWARD, end);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2195 compiler_use_next_block(c, next);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2196 ADDOP(c, POP_TOP);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2197 if (s->v.If.orelse)
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2198 VISIT_SEQ(c, stmt, s->v.If.orelse);
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	2199 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2200 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2201 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2202 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2203
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2204 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2205 compiler_for(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2206 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2207 basicblock start, cleanup, *end;
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 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2210 cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2211 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2212 if (start == NULL \|\| end == NULL \|\| cleanup == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2213 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2214 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2215 if (!compiler_push_fblock(c, LOOP, start))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2216 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2217 VISIT(c, expr, s->v.For.iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2218 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2219 compiler_use_next_block(c, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2220 ADDOP_JREL(c, FOR_ITER, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2221 VISIT(c, expr, s->v.For.target);
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2222 VISIT_SEQ(c, stmt, s->v.For.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2223 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2224 compiler_use_next_block(c, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2225 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2226 compiler_pop_fblock(c, LOOP, start);
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2227 VISIT_SEQ(c, stmt, s->v.For.orelse);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2228 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2229 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2230 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2231
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2232 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2233 compiler_while(struct compiler *c, stmt_ty s)
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 basicblock loop, orelse, end, anchor = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2236 int constant = expr_constant(s->v.While.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2237
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2238 if (constant == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2239 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2240 loop = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2241 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2242 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2243 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2244 if (anchor == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2245 return 0;
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 if (loop == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2248 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2249 if (s->v.While.orelse) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2250 orelse = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2251 if (orelse == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2252 return 0;
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 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2255 orelse = NULL;
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 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2258 compiler_use_next_block(c, loop);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2259 if (!compiler_push_fblock(c, LOOP, loop))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2260 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2261 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2262 VISIT(c, expr, s->v.While.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2263 ADDOP_JREL(c, JUMP_IF_FALSE, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2264 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2265 }
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2266 VISIT_SEQ(c, stmt, s->v.While.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2267 ADDOP_JABS(c, JUMP_ABSOLUTE, loop);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2268
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2269 /* 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	2270 if there is no else clause ?
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2271 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2272
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2273 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2274 compiler_use_next_block(c, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2275 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2276 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2277 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2278 compiler_pop_fblock(c, LOOP, loop);
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	2279 if (orelse != NULL) /* what if orelse is just pass? */
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2280 VISIT_SEQ(c, stmt, s->v.While.orelse);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2281 compiler_use_next_block(c, end);
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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2284 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2285
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2286 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2287 compiler_continue(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2288 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2289 static const char LOOP_ERROR_MSG[] = "'continue' not properly in loop";
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2290 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2291
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2292 if (!c->u->u_nfblocks)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2293 return compiler_error(c, LOOP_ERROR_MSG);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2294 i = c->u->u_nfblocks - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2295 switch (c->u->u_fblock[i].fb_type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2296 case LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2297 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	2298 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2299 case EXCEPT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2300 case FINALLY_TRY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2301 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	2302 ;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2303 if (i == -1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2304 return compiler_error(c, LOOP_ERROR_MSG);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2305 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	2306 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2307 case FINALLY_END:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2308 return compiler_error(c,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2309 "'continue' not supported inside 'finally' clause");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2310 }
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 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2315 /* 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	2316
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2317 SETUP_FINALLY L
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2318 <code for body>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2319 POP_BLOCK
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2320 LOAD_CONST <None>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2321 L: <code for finalbody>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2322 END_FINALLY
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2323
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2324 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	2325 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	2326 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	2327 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	2328
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2329 SETUP_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2330 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	2331 onto the block stack.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2332 POP_BLOCK:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2333 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	2334 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	2335 block stack. (The label is ignored.)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2336 END_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2337 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	2338 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	2339 entries popped depends on the (pseudo) exception type.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2340
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2341 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	2342 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	2343 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	2344 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	2345 stack.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2346 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2347
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2348 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2349 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	2350 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2351 basicblock body, end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2352 body = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2353 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2354 if (body == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2355 return 0;
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 ADDOP_JREL(c, SETUP_FINALLY, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2358 compiler_use_next_block(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2359 if (!compiler_push_fblock(c, FINALLY_TRY, body))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2360 return 0;
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2361 VISIT_SEQ(c, stmt, s->v.TryFinally.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2362 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2363 compiler_pop_fblock(c, FINALLY_TRY, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2364
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2365 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2366 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2367 if (!compiler_push_fblock(c, FINALLY_END, end))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2368 return 0;
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2369 VISIT_SEQ(c, stmt, s->v.TryFinally.finalbody);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2370 ADDOP(c, END_FINALLY);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2371 compiler_pop_fblock(c, FINALLY_END, end);
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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2374 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2375
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 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	2378 (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	2379 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	2380 associated value, and 'exc' the exception.)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2381
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2382 Value stack Label Instruction Argument
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2383 [] SETUP_EXCEPT L1
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2384 [] <code for S>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2385 [] POP_BLOCK
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2386 [] JUMP_FORWARD L0
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2387
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2388 [tb, val, exc] L1: DUP )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2389 [tb, val, exc, exc] <evaluate E1> )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2390 [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	2391 [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	2392 [tb, val, exc, 1] POP )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2393 [tb, val, exc] POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2394 [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	2395 [tb] POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2396 [] <code for S1>
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2397 JUMP_FORWARD L0
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2398
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2399 [tb, val, exc, 0] L2: POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2400 [tb, val, exc] DUP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2401 .............................etc.......................
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 [tb, val, exc, 0] Ln+1: POP
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2404 [tb, val, exc] END_FINALLY # re-raise exception
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2405
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2406 [] L0: <next statement>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2407
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2408 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	2409 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2410 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2411 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	2412 {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2413 basicblock body, orelse, except, end;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2414 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2415
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2416 body = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2417 except = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2418 orelse = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2419 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2420 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	2421 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2422 ADDOP_JREL(c, SETUP_EXCEPT, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2423 compiler_use_next_block(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2424 if (!compiler_push_fblock(c, EXCEPT, body))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2425 return 0;
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2426 VISIT_SEQ(c, stmt, s->v.TryExcept.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2427 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2428 compiler_pop_fblock(c, EXCEPT, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2429 ADDOP_JREL(c, JUMP_FORWARD, orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2430 n = asdl_seq_LEN(s->v.TryExcept.handlers);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2431 compiler_use_next_block(c, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2432 for (i = 0; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	2433 excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET(
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2434 s->v.TryExcept.handlers, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2435 if (!handler->type && i < n-1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2436 return compiler_error(c, "default 'except:' must be last");
37468 04afb3650847 Generate line number table entries for except handlers. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37418 diff changeset	2437 c->u->u_lineno_set = false;
04afb3650847 Generate line number table entries for except handlers. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37418 diff changeset	2438 c->u->u_lineno = handler->lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2439 except = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2440 if (except == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2441 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2442 if (handler->type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2443 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2444 VISIT(c, expr, handler->type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2445 ADDOP_I(c, COMPARE_OP, PyCmp_EXC_MATCH);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2446 ADDOP_JREL(c, JUMP_IF_FALSE, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2447 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2448 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2449 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2450 if (handler->name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2451 VISIT(c, expr, handler->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2452 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2453 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2454 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2455 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2456 ADDOP(c, POP_TOP);
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2457 VISIT_SEQ(c, stmt, handler->body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2458 ADDOP_JREL(c, JUMP_FORWARD, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2459 compiler_use_next_block(c, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2460 if (handler->type)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2461 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2462 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2463 ADDOP(c, END_FINALLY);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2464 compiler_use_next_block(c, orelse);
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2465 VISIT_SEQ(c, stmt, s->v.TryExcept.orelse);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2466 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2467 return 1;
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2471 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	2472 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2473 /* 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	2474 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	2475
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2476 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	2477 LOAD_ATTR for each 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 const char *src = PyString_AS_STRING(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2480 const char *dot = strchr(src, '.');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2481 if (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2482 /* 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	2483 src = dot + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2484 while (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2485 /* 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	2486 PyObject *attr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2487 dot = strchr(src, '.');
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	2488 attr = PyString_FromStringAndSize(src,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2489 dot ? dot - src : strlen(src));
35895 fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2490 if (!attr)
fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2491 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2492 ADDOP_O(c, LOAD_ATTR, attr, names);
35895 fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2493 Py_DECREF(attr);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2494 src = dot + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2495 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2496 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2497 return compiler_nameop(c, asname, Store);
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_import(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 /* 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	2504 string. This is convenient for all cases except
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2505 import a.b.c as d
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2506 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	2507 module names.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2508 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	2509 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2510 int i, n = asdl_seq_LEN(s->v.Import.names);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2511
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2512 for (i = 0; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	2513 alias_ty alias = (alias_ty)asdl_seq_GET(s->v.Import.names, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2514 int r;
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2515 PyObject *level;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2516
37418 cea54c9d921d Don't abbreviate ABS, use long name ABSOLUTE. Neal Norwitz <nnorwitz@gmail.com> parents: 37390 diff changeset	2517 if (c->c_flags && (c->c_flags->cf_flags & CO_FUTURE_ABSOLUTE_IMPORT))
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2518 level = PyInt_FromLong(0);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2519 else
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2520 level = PyInt_FromLong(-1);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2521
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2522 if (level == NULL)
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2523 return 0;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2524
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2525 ADDOP_O(c, LOAD_CONST, level, consts);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2526 Py_DECREF(level);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2527 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2528 ADDOP_NAME(c, IMPORT_NAME, alias->name, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2529
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2530 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	2531 r = compiler_import_as(c, alias->name, alias->asname);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2532 if (!r)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2533 return r;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2534 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2535 else {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2536 identifier tmp = alias->name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2537 const char *base = PyString_AS_STRING(alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2538 char *dot = strchr(base, '.');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2539 if (dot)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2540 tmp = PyString_FromStringAndSize(base,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2541 dot - base);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2542 r = compiler_nameop(c, tmp, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2543 if (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2544 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2545 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2546 if (!r)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2547 return r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2548 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2549 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2550 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2553 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2554 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	2555 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2556 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	2557
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2558 PyObject *names = PyTuple_New(n);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2559 PyObject *level;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2560
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2561 if (!names)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2562 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2563
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2564 if (s->v.ImportFrom.level == 0 && c->c_flags &&
37418 cea54c9d921d Don't abbreviate ABS, use long name ABSOLUTE. Neal Norwitz <nnorwitz@gmail.com> parents: 37390 diff changeset	2565 !(c->c_flags->cf_flags & CO_FUTURE_ABSOLUTE_IMPORT))
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2566 level = PyInt_FromLong(-1);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2567 else
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2568 level = PyInt_FromLong(s->v.ImportFrom.level);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2569
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2570 if (!level) {
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2571 Py_DECREF(names);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2572 return 0;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2573 }
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2574
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2575 /* build up the names */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2576 for (i = 0; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	2577 alias_ty alias = (alias_ty)asdl_seq_GET(s->v.ImportFrom.names, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2578 Py_INCREF(alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2579 PyTuple_SET_ITEM(names, i, alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2580 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2581
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2582 if (s->lineno > c->c_future->ff_lineno) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2583 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	2584 "__future__")) {
36804 c552f2275782 Fix refleak if from __future__ import was not first Neal Norwitz <nnorwitz@gmail.com> parents: 36797 diff changeset	2585 Py_DECREF(level);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2586 Py_DECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2587 return compiler_error(c,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2588 "from __future__ imports must occur "
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2589 "at the beginning of the file");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2590
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2591 }
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
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2594 ADDOP_O(c, LOAD_CONST, level, consts);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2595 Py_DECREF(level);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2596 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	2597 Py_DECREF(names);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2598 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	2599 for (i = 0; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	2600 alias_ty alias = (alias_ty)asdl_seq_GET(s->v.ImportFrom.names, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2601 identifier store_name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2602
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2603 if (i == 0 && PyString_AS_STRING(alias->name) == '') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2604 assert(n == 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2605 ADDOP(c, IMPORT_STAR);
35993 a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2606 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2607 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2608
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2609 ADDOP_NAME(c, IMPORT_FROM, alias->name, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2610 store_name = alias->name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2611 if (alias->asname)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2612 store_name = alias->asname;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2613
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2614 if (!compiler_nameop(c, store_name, Store)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2615 Py_DECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2616 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2617 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2618 }
35993 a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2619 /* remove imported module */
a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2620 ADDOP(c, POP_TOP);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2621 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2622 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2623
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2624 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2625 compiler_assert(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2626 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2627 static PyObject *assertion_error = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2628 basicblock *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2629
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2630 if (Py_OptimizeFlag)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2631 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2632 if (assertion_error == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2633 assertion_error = PyString_FromString("AssertionError");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2634 if (assertion_error == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2635 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2636 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2637 VISIT(c, expr, s->v.Assert.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2638 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2639 if (end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2640 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2641 ADDOP_JREL(c, JUMP_IF_TRUE, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2642 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2643 ADDOP_O(c, LOAD_GLOBAL, assertion_error, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2644 if (s->v.Assert.msg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2645 VISIT(c, expr, s->v.Assert.msg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2646 ADDOP_I(c, RAISE_VARARGS, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2647 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2648 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2649 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	2650 }
36081 19d96c2d7df5 Fix Armin's bug 1333982. He found it, he didn't created it :-) Neal Norwitz <nnorwitz@gmail.com> parents: 36079 diff changeset	2651 compiler_use_next_block(c, end);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2652 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2653 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2654 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2655
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2656 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2657 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	2658 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2659 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2660
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	2661 /* Always assign a lineno to the next instruction for a stmt. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2662 c->u->u_lineno = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2663 c->u->u_lineno_set = false;
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	2664
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2665 switch (s->kind) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2666 case FunctionDef_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2667 return compiler_function(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2668 case ClassDef_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2669 return compiler_class(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2670 case Return_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2671 if (c->u->u_ste->ste_type != FunctionBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2672 return compiler_error(c, "'return' outside function");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2673 if (s->v.Return.value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2674 VISIT(c, expr, s->v.Return.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2675 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2676 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2677 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2678 ADDOP(c, RETURN_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2679 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2680 case Delete_kind:
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	2681 VISIT_SEQ(c, expr, s->v.Delete.targets)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2682 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2683 case Assign_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2684 n = asdl_seq_LEN(s->v.Assign.targets);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2685 VISIT(c, expr, s->v.Assign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2686 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2687 if (i < n - 1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2688 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2689 VISIT(c, expr,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2690 (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	2691 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2692 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2693 case AugAssign_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2694 return compiler_augassign(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2695 case Print_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2696 return compiler_print(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2697 case For_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2698 return compiler_for(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2699 case While_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2700 return compiler_while(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2701 case If_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2702 return compiler_if(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2703 case Raise_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2704 n = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2705 if (s->v.Raise.type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2706 VISIT(c, expr, s->v.Raise.type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2707 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2708 if (s->v.Raise.inst) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2709 VISIT(c, expr, s->v.Raise.inst);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2710 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2711 if (s->v.Raise.tback) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2712 VISIT(c, expr, s->v.Raise.tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2713 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2714 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2715 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2716 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2717 ADDOP_I(c, RAISE_VARARGS, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2718 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2719 case TryExcept_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2720 return compiler_try_except(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2721 case TryFinally_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2722 return compiler_try_finally(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2723 case Assert_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2724 return compiler_assert(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2725 case Import_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2726 return compiler_import(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2727 case ImportFrom_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2728 return compiler_from_import(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2729 case Exec_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2730 VISIT(c, expr, s->v.Exec.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2731 if (s->v.Exec.globals) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2732 VISIT(c, expr, s->v.Exec.globals);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2733 if (s->v.Exec.locals) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2734 VISIT(c, expr, s->v.Exec.locals);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2735 } else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2736 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2737 }
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 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2740 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2741 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2742 ADDOP(c, EXEC_STMT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2743 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2744 case Global_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2745 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2746 case Expr_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2747 VISIT(c, expr, s->v.Expr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2748 if (c->c_interactive && c->c_nestlevel <= 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2749 ADDOP(c, PRINT_EXPR);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2750 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2751 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2752 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2753 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2754 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2755 case Pass_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2756 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2757 case Break_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2758 if (!c->u->u_nfblocks)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2759 return compiler_error(c, "'break' outside loop");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2760 ADDOP(c, BREAK_LOOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2761 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2762 case Continue_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2763 return compiler_continue(c);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2764 case With_kind:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2765 return compiler_with(c, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2766 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2767 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2768 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2769
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2770 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2771 unaryop(unaryop_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2772 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2773 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2774 case Invert:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2775 return UNARY_INVERT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2776 case Not:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2777 return UNARY_NOT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2778 case UAdd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2779 return UNARY_POSITIVE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2780 case USub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2781 return UNARY_NEGATIVE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2782 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2783 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2784 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2785
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2786 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2787 binop(struct compiler *c, operator_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2788 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2789 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2790 case Add:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2791 return BINARY_ADD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2792 case Sub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2793 return BINARY_SUBTRACT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2794 case Mult:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2795 return BINARY_MULTIPLY;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2796 case Div:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2797 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	2798 return BINARY_TRUE_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2799 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2800 return BINARY_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2801 case Mod:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2802 return BINARY_MODULO;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2803 case Pow:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2804 return BINARY_POWER;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2805 case LShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2806 return BINARY_LSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2807 case RShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2808 return BINARY_RSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2809 case BitOr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2810 return BINARY_OR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2811 case BitXor:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2812 return BINARY_XOR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2813 case BitAnd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2814 return BINARY_AND;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2815 case FloorDiv:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2816 return BINARY_FLOOR_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2817 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2818 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2819 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2820
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2821 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2822 cmpop(cmpop_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2823 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2824 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2825 case Eq:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2826 return PyCmp_EQ;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2827 case NotEq:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2828 return PyCmp_NE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2829 case Lt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2830 return PyCmp_LT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2831 case LtE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2832 return PyCmp_LE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2833 case Gt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2834 return PyCmp_GT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2835 case GtE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2836 return PyCmp_GE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2837 case Is:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2838 return PyCmp_IS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2839 case IsNot:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2840 return PyCmp_IS_NOT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2841 case In:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2842 return PyCmp_IN;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2843 case NotIn:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2844 return PyCmp_NOT_IN;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2845 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2846 return PyCmp_BAD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2847 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2848
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2849 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2850 inplace_binop(struct compiler *c, operator_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2851 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2852 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2853 case Add:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2854 return INPLACE_ADD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2855 case Sub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2856 return INPLACE_SUBTRACT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2857 case Mult:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2858 return INPLACE_MULTIPLY;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2859 case Div:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2860 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	2861 return INPLACE_TRUE_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2862 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2863 return INPLACE_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2864 case Mod:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2865 return INPLACE_MODULO;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2866 case Pow:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2867 return INPLACE_POWER;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2868 case LShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2869 return INPLACE_LSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2870 case RShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2871 return INPLACE_RSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2872 case BitOr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2873 return INPLACE_OR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2874 case BitXor:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2875 return INPLACE_XOR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2876 case BitAnd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2877 return INPLACE_AND;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2878 case FloorDiv:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2879 return INPLACE_FLOOR_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2880 }
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2881 PyErr_Format(PyExc_SystemError,
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2882 "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	2883 return 0;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2886 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2887 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	2888 {
35781 31d36dd5959c Remove unnecessary local variable. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35779 diff changeset	2889 int op, scope, arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2890 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	2891
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2892 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	2893 PyObject *mangled;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2894 /* XXX AugStore isn't used anywhere! */
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 /* First check for assignment to __debug__. Param? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2897 if ((ctx == Store \|\| ctx == AugStore \|\| ctx == Del)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2898 && !strcmp(PyString_AS_STRING(name), "__debug__")) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2899 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	2900 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2901
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2902 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	2903 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	2904 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	2905
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2906 op = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2907 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	2908 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	2909 switch (scope) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2910 case FREE:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2911 dict = c->u->u_freevars;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2912 optype = OP_DEREF;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2913 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2914 case CELL:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2915 dict = c->u->u_cellvars;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2916 optype = OP_DEREF;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2917 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2918 case LOCAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2919 if (c->u->u_ste->ste_type == FunctionBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2920 optype = OP_FAST;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2921 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2922 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	2923 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	2924 !c->u->u_ste->ste_unoptimized)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2925 optype = OP_GLOBAL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2926 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2927 case GLOBAL_EXPLICIT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2928 optype = OP_GLOBAL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2929 break;
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2930 default:
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2931 /* scope can be 0 */
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2932 break;
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2935 /* 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	2936 assert(scope \|\| PyString_AS_STRING(name)[0] == '_');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2937
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2938 switch (optype) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2939 case OP_DEREF:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2940 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2941 case Load: op = LOAD_DEREF; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2942 case Store: op = STORE_DEREF; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2943 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2944 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2945 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2946 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2947 PyErr_Format(PyExc_SyntaxError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2948 "can not delete variable '%s' referenced "
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2949 "in nested scope",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2950 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	2951 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2952 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2953 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2954 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2955 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2956 "param invalid for deref variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2957 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2958 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2959 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2960 case OP_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2961 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2962 case Load: op = LOAD_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2963 case Store: op = STORE_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2964 case Del: op = DELETE_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2965 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2966 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2967 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2968 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2969 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2970 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2971 "param invalid for local variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2972 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2973 }
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2974 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	2975 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2976 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2977 case OP_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2978 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2979 case Load: op = LOAD_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2980 case Store: op = STORE_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2981 case Del: op = DELETE_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2982 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2983 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2984 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2985 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2986 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2987 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2988 "param invalid for global variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2989 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2990 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2991 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2992 case OP_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2993 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2994 case Load: op = LOAD_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2995 case Store: op = STORE_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2996 case Del: op = DELETE_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2997 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2998 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2999 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3000 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3001 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3002 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3003 "param invalid for name variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3004 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3005 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3006 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3007 }
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 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	3010 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	3011 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	3012 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	3013 return 0;
35781 31d36dd5959c Remove unnecessary local variable. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35779 diff changeset	3014 return compiler_addop_i(c, op, arg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3015 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3016
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3017 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3018 compiler_boolop(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3019 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3020 basicblock *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3021 int jumpi, i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3022 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3023
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3024 assert(e->kind == BoolOp_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3025 if (e->v.BoolOp.op == And)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3026 jumpi = JUMP_IF_FALSE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3027 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3028 jumpi = JUMP_IF_TRUE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3029 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	3030 if (end == NULL)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3031 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3032 s = e->v.BoolOp.values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3033 n = asdl_seq_LEN(s) - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3034 for (i = 0; i < n; ++i) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3035 VISIT(c, expr, (expr_ty)asdl_seq_GET(s, i));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3036 ADDOP_JREL(c, jumpi, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3037 ADDOP(c, POP_TOP)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3038 }
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3039 VISIT(c, expr, (expr_ty)asdl_seq_GET(s, n));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3040 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3041 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3042 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3043
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3044 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3045 compiler_list(struct compiler *c, expr_ty e)
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 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	3048 if (e->v.List.ctx == Store) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3049 ADDOP_I(c, UNPACK_SEQUENCE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3050 }
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	3051 VISIT_SEQ(c, expr, e->v.List.elts);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3052 if (e->v.List.ctx == Load) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3053 ADDOP_I(c, BUILD_LIST, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3054 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3055 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3056 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3057
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3058 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3059 compiler_tuple(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3060 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3061 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	3062 if (e->v.Tuple.ctx == Store) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3063 ADDOP_I(c, UNPACK_SEQUENCE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3064 }
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	3065 VISIT_SEQ(c, expr, e->v.Tuple.elts);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3066 if (e->v.Tuple.ctx == Load) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3067 ADDOP_I(c, BUILD_TUPLE, n);
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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3070 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3071
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3072 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3073 compiler_compare(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3074 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3075 int i, n;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3076 basicblock *cleanup = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3077
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3078 /* 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	3079 VISIT(c, expr, e->v.Compare.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3080 n = asdl_seq_LEN(e->v.Compare.ops);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3081 assert(n > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3082 if (n > 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3083 cleanup = compiler_new_block(c);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3084 if (cleanup == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3085 return 0;
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3086 VISIT(c, expr,
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3087 (expr_ty)asdl_seq_GET(e->v.Compare.comparators, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3088 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3089 for (i = 1; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3090 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3091 ADDOP(c, ROT_THREE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3092 ADDOP_I(c, COMPARE_OP,
37685 5e72b0c74100 Introduce asdl_int_seq, to hold cmpop_ty. Martin v. Löwis <martin@v.loewis.de> parents: 37680 diff changeset	3093 cmpop((cmpop_ty)(asdl_seq_GET(
37680 fe88e01ff6de revert - breaks build of Python/ast.c w/ gcc Skip Montanaro <skip@pobox.com> parents: 37679 diff changeset	3094 e->v.Compare.ops, i - 1))));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3095 ADDOP_JREL(c, JUMP_IF_FALSE, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3096 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3097 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3098 if (i < (n - 1))
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3099 VISIT(c, expr,
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3100 (expr_ty)asdl_seq_GET(e->v.Compare.comparators, i));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3101 }
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3102 VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Compare.comparators, n - 1));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3103 ADDOP_I(c, COMPARE_OP,
37685 5e72b0c74100 Introduce asdl_int_seq, to hold cmpop_ty. Martin v. Löwis <martin@v.loewis.de> parents: 37680 diff changeset	3104 cmpop((cmpop_ty)(asdl_seq_GET(e->v.Compare.ops, n - 1))));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3105 if (n > 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3106 basicblock *end = compiler_new_block(c);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3107 if (end == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3108 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3109 ADDOP_JREL(c, JUMP_FORWARD, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3110 compiler_use_next_block(c, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3111 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3112 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3113 compiler_use_next_block(c, end);
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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3116 }
37650 8c998c760191 casting nastiness to make C++ compiler happy Anthony Baxter <anthonybaxter@gmail.com> parents: 37614 diff changeset	3117 #undef CMPCAST
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3118
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3119 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3120 compiler_call(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3121 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3122 int n, code = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3123
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3124 VISIT(c, expr, e->v.Call.func);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3125 n = asdl_seq_LEN(e->v.Call.args);
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	3126 VISIT_SEQ(c, expr, e->v.Call.args);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3127 if (e->v.Call.keywords) {
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	3128 VISIT_SEQ(c, keyword, e->v.Call.keywords);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3129 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	3130 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3131 if (e->v.Call.starargs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3132 VISIT(c, expr, e->v.Call.starargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3133 code \|= 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3134 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3135 if (e->v.Call.kwargs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3136 VISIT(c, expr, e->v.Call.kwargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3137 code \|= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3138 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3139 switch (code) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3140 case 0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3141 ADDOP_I(c, CALL_FUNCTION, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3142 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3143 case 1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3144 ADDOP_I(c, CALL_FUNCTION_VAR, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3145 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3146 case 2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3147 ADDOP_I(c, CALL_FUNCTION_KW, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3148 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3149 case 3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3150 ADDOP_I(c, CALL_FUNCTION_VAR_KW, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3151 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3152 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3153 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3154 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3157 compiler_listcomp_generator(struct compiler c, PyObject tmpname,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3158 asdl_seq *generators, int gen_index,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3159 expr_ty elt)
35742 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 /* 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	3162 and then write to the element */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3163
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3164 comprehension_ty l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3165 basicblock start, anchor, skip, if_cleanup;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3166 int i, n;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3167
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3168 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3169 skip = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3170 if_cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3171 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3172
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3173 if (start == NULL \|\| skip == NULL \|\| if_cleanup == NULL \|\|
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3174 anchor == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3175 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3176
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3177 l = (comprehension_ty)asdl_seq_GET(generators, gen_index);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3178 VISIT(c, expr, l->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3179 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3180 compiler_use_next_block(c, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3181 ADDOP_JREL(c, FOR_ITER, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3182 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3183 VISIT(c, expr, l->target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3184
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3185 /* XXX this needs to be cleaned up...a lot! */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3186 n = asdl_seq_LEN(l->ifs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3187 for (i = 0; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3188 expr_ty e = (expr_ty)asdl_seq_GET(l->ifs, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3189 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3190 ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3191 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3192 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3193 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3194
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3195 if (++gen_index < asdl_seq_LEN(generators))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3196 if (!compiler_listcomp_generator(c, tmpname,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3197 generators, gen_index, elt))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3198 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3199
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3200 /* only append after the last for generator */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3201 if (gen_index >= asdl_seq_LEN(generators)) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3202 if (!compiler_nameop(c, tmpname, Load))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3203 return 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3204 VISIT(c, expr, elt);
36824 07f330ad1b47 SF bug 1442442: LIST_APPEND optimization got lost in the AST merge. Neal Norwitz <nnorwitz@gmail.com> parents: 36804 diff changeset	3205 ADDOP(c, LIST_APPEND);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3206
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3207 compiler_use_next_block(c, skip);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3208 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3209 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3210 ADDOP_I(c, JUMP_FORWARD, 1);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3211 if (i == 0)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3212 compiler_use_next_block(c, if_cleanup);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3213 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3214 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3215 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3216 compiler_use_next_block(c, anchor);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3217 /* delete the append method added to locals */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3218 if (gen_index == 1)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3219 if (!compiler_nameop(c, tmpname, Del))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3220 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3221
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3222 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3225 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3226 compiler_listcomp(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3227 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3228 identifier tmp;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3229 int rc = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3230 static identifier append;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3231 asdl_seq *generators = e->v.ListComp.generators;
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 assert(e->kind == ListComp_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3234 if (!append) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3235 append = PyString_InternFromString("append");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3236 if (!append)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3237 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3238 }
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3239 tmp = compiler_new_tmpname(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3240 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3241 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3242 ADDOP_I(c, BUILD_LIST, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3243 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3244 if (compiler_nameop(c, tmp, Store))
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3245 rc = compiler_listcomp_generator(c, tmp, generators, 0,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3246 e->v.ListComp.elt);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3247 Py_DECREF(tmp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3248 return rc;
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3252 compiler_genexp_generator(struct compiler *c,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3253 asdl_seq *generators, int gen_index,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3254 expr_ty elt)
35742 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 /* 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	3257 and then write to the element */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3258
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3259 comprehension_ty ge;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3260 basicblock start, anchor, skip, if_cleanup, *end;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3261 int i, n;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3262
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3263 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3264 skip = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3265 if_cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3266 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3267 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3268
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3269 if (start == NULL \|\| skip == NULL \|\| if_cleanup == NULL \|\|
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3270 anchor == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3271 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3272
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3273 ge = (comprehension_ty)asdl_seq_GET(generators, gen_index);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3274 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3275 if (!compiler_push_fblock(c, LOOP, start))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3276 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3277
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3278 if (gen_index == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3279 /* Receive outermost iter as an implicit argument */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3280 c->u->u_argcount = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3281 ADDOP_I(c, LOAD_FAST, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3282 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3283 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3284 /* Sub-iter - calculate on the fly */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3285 VISIT(c, expr, ge->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3286 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3287 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3288 compiler_use_next_block(c, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3289 ADDOP_JREL(c, FOR_ITER, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3290 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3291 VISIT(c, expr, ge->target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3292
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3293 /* XXX this needs to be cleaned up...a lot! */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3294 n = asdl_seq_LEN(ge->ifs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3295 for (i = 0; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3296 expr_ty e = (expr_ty)asdl_seq_GET(ge->ifs, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3297 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3298 ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3299 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3300 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3301 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3302
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3303 if (++gen_index < asdl_seq_LEN(generators))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3304 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	3305 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3306
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3307 /* only append after the last 'for' generator */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3308 if (gen_index >= asdl_seq_LEN(generators)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3309 VISIT(c, expr, elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3310 ADDOP(c, YIELD_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3311 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3312
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3313 compiler_use_next_block(c, skip);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3314 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3315 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3316 ADDOP_I(c, JUMP_FORWARD, 1);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3317 if (i == 0)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3318 compiler_use_next_block(c, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3319
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3320 ADDOP(c, POP_TOP);
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 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3323 compiler_use_next_block(c, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3324 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3325 compiler_pop_fblock(c, LOOP, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3326 compiler_use_next_block(c, end);
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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3329 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3330
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3331 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3332 compiler_genexp(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3333 {
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	3334 static identifier name;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3335 PyCodeObject *co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3336 expr_ty outermost_iter = ((comprehension_ty)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3337 (asdl_seq_GET(e->v.GeneratorExp.generators,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3338 0)))->iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3339
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	3340 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	3341 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	3342 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	3343 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	3344 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3345
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3346 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	3347 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3348 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	3349 e->v.GeneratorExp.elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3350 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	3351 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3352 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3353 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3354
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3355 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	3356 Py_DECREF(co);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3357
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3358 VISIT(c, expr, outermost_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3359 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3360 ADDOP_I(c, CALL_FUNCTION, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3361
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3362 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3363 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3364
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3365 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3366 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	3367 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3368 ADDOP_O(c, LOAD_CONST, k->arg, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3369 VISIT(c, expr, k->value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3370 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3371 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3372
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3373 /* Test whether expression is constant. For constants, report
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3374 whether they are true or false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3375
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3376 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	3377 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3378
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3379 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3380 expr_constant(expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3381 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3382 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3383 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3384 return PyObject_IsTrue(e->v.Num.n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3385 case Str_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3386 return PyObject_IsTrue(e->v.Str.s);
38588 5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	3387 case Name_kind:
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	3388 /* __debug__ is not assignable, so we can optimize
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	3389 * it away in if and while statements */
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	3390 if (strcmp(PyString_AS_STRING(e->v.Name.id),
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	3391 "__debug__") == 0)
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	3392 return ! Py_OptimizeFlag;
5dfb21a37f19 Patch #1346214: correctly optimize away "if 0"-style stmts Georg Brandl <georg@python.org> parents: 38406 diff changeset	3393 /* fall through */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3394 default:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3395 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3396 }
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
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3399 /*
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3400 Implements the with statement from PEP 343.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3401
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3402 The semantics outlined in that PEP are as follows:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3403
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3404 with EXPR as VAR:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3405 BLOCK
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3406
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3407 It is implemented roughly as:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3408
38084 a812d0fae74a Get rid of __context__, per the latest changes to PEP 343 and python-dev Guido van Rossum <guido@python.org> parents: 37685 diff changeset	3409 context = EXPR
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3410 exit = context.__exit__ # not calling it
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3411 value = context.__enter__()
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3412 try:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3413 VAR = value # if VAR present in the syntax
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3414 BLOCK
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3415 finally:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3416 if an exception was raised:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3417 exc = copy of (exception, instance, traceback)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3418 else:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3419 exc = (None, None, None)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3420 exit(*exc)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3421 */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3422 static int
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3423 compiler_with(struct compiler *c, stmt_ty s)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3424 {
38084 a812d0fae74a Get rid of __context__, per the latest changes to PEP 343 and python-dev Guido van Rossum <guido@python.org> parents: 37685 diff changeset	3425 static identifier enter_attr, exit_attr;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3426 basicblock block, finally;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3427 identifier tmpexit, tmpvalue = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3428
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3429 assert(s->kind == With_kind);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3430
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3431 if (!enter_attr) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3432 enter_attr = PyString_InternFromString("__enter__");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3433 if (!enter_attr)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3434 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3435 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3436 if (!exit_attr) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3437 exit_attr = PyString_InternFromString("__exit__");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3438 if (!exit_attr)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3439 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3440 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3441
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3442 block = compiler_new_block(c);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3443 finally = compiler_new_block(c);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3444 if (!block \|\| !finally)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3445 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3446
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3447 /* Create a temporary variable to hold context.__exit__ */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3448 tmpexit = compiler_new_tmpname(c);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3449 if (tmpexit == NULL)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3450 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3451 PyArena_AddPyObject(c->c_arena, tmpexit);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3452
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3453 if (s->v.With.optional_vars) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3454 /* Create a temporary variable to hold context.__enter__().
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3455 We need to do this rather than preserving it on the stack
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3456 because SETUP_FINALLY remembers the stack level.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3457 We need to do the assignment inside the try/finally
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3458 so that context.__exit__() is called when the assignment
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3459 fails. But we need to call context.__enter__() before
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3460 the try/finally so that if it fails we won't call
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3461 context.__exit__().
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3462 */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3463 tmpvalue = compiler_new_tmpname(c);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3464 if (tmpvalue == NULL)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3465 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3466 PyArena_AddPyObject(c->c_arena, tmpvalue);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3467 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3468
38084 a812d0fae74a Get rid of __context__, per the latest changes to PEP 343 and python-dev Guido van Rossum <guido@python.org> parents: 37685 diff changeset	3469 /* Evaluate EXPR */
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3470 VISIT(c, expr, s->v.With.context_expr);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3471
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3472 /* Squirrel away context.__exit__ */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3473 ADDOP(c, DUP_TOP);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3474 ADDOP_O(c, LOAD_ATTR, exit_attr, names);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3475 if (!compiler_nameop(c, tmpexit, Store))
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3476 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3477
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3478 /* Call context.__enter__() */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3479 ADDOP_O(c, LOAD_ATTR, enter_attr, names);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3480 ADDOP_I(c, CALL_FUNCTION, 0);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3481
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3482 if (s->v.With.optional_vars) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3483 /* Store it in tmpvalue */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3484 if (!compiler_nameop(c, tmpvalue, Store))
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3485 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3486 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3487 else {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3488 /* Discard result from context.__enter__() */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3489 ADDOP(c, POP_TOP);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3490 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3491
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3492 /* Start the try block */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3493 ADDOP_JREL(c, SETUP_FINALLY, finally);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3494
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3495 compiler_use_next_block(c, block);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3496 if (!compiler_push_fblock(c, FINALLY_TRY, block)) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3497 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3498 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3499
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3500 if (s->v.With.optional_vars) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3501 /* Bind saved result of context.__enter__() to VAR */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3502 if (!compiler_nameop(c, tmpvalue, Load) \|\|
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3503 !compiler_nameop(c, tmpvalue, Del))
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3504 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3505 VISIT(c, expr, s->v.With.optional_vars);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3506 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3507
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3508 /* BLOCK code */
37614 72ceb1b30d4b per Jeremy's email, remove the _WITH_CAST versions of macros. g++ Anthony Baxter <anthonybaxter@gmail.com> parents: 37606 diff changeset	3509 VISIT_SEQ(c, stmt, s->v.With.body);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3510
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3511 /* End of try block; start the finally block */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3512 ADDOP(c, POP_BLOCK);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3513 compiler_pop_fblock(c, FINALLY_TRY, block);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3514
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3515 ADDOP_O(c, LOAD_CONST, Py_None, consts);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3516 compiler_use_next_block(c, finally);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3517 if (!compiler_push_fblock(c, FINALLY_END, finally))
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3518 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3519
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3520 /* Finally block starts; push tmpexit and issue our magic opcode. */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3521 if (!compiler_nameop(c, tmpexit, Load) \|\|
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3522 !compiler_nameop(c, tmpexit, Del))
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3523 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3524 ADDOP(c, WITH_CLEANUP);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3525
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3526 /* Finally block ends. */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3527 ADDOP(c, END_FINALLY);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3528 compiler_pop_fblock(c, FINALLY_END, finally);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3529 return 1;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3530 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3531
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3532 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3533 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	3534 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3535 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3536
37390 5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	3537 /* If expr e has a different line number than the last expr/stmt,
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	3538 set a new line number for the next instruction.
5e1cf21d4ab2 Expand comments on line numbers and blocks. Jeremy Hylton <jeremy@alum.mit.edu> parents: 37067 diff changeset	3539 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3540 if (e->lineno > c->u->u_lineno) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3541 c->u->u_lineno = e->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3542 c->u->u_lineno_set = false;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3543 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3544 switch (e->kind) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3545 case BoolOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3546 return compiler_boolop(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3547 case BinOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3548 VISIT(c, expr, e->v.BinOp.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3549 VISIT(c, expr, e->v.BinOp.right);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3550 ADDOP(c, binop(c, e->v.BinOp.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3551 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3552 case UnaryOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3553 VISIT(c, expr, e->v.UnaryOp.operand);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3554 ADDOP(c, unaryop(e->v.UnaryOp.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3555 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3556 case Lambda_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3557 return compiler_lambda(c, e);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	3558 case IfExp_kind:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	3559 return compiler_ifexp(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3560 case Dict_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3561 /* XXX get rid of arg? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3562 ADDOP_I(c, BUILD_MAP, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3563 n = asdl_seq_LEN(e->v.Dict.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3564 /* 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	3565 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	3566 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3567 ADDOP(c, DUP_TOP);
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3568 VISIT(c, expr,
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3569 (expr_ty)asdl_seq_GET(e->v.Dict.values, i));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3570 ADDOP(c, ROT_TWO);
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3571 VISIT(c, expr,
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3572 (expr_ty)asdl_seq_GET(e->v.Dict.keys, i));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3573 ADDOP(c, STORE_SUBSCR);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3574 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3575 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3576 case ListComp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3577 return compiler_listcomp(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3578 case GeneratorExp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3579 return compiler_genexp(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3580 case Yield_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3581 if (c->u->u_ste->ste_type != FunctionBlock)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3582 return compiler_error(c, "'yield' outside function");
35742 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 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	3585 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	3586 return compiler_error(
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3587 c, "'yield' not allowed in a 'try' "
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3588 "block with a 'finally' clause");
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 if (e->v.Yield.value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3592 VISIT(c, expr, e->v.Yield.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3593 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3594 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3595 ADDOP_O(c, LOAD_CONST, Py_None, consts);
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 ADDOP(c, YIELD_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3598 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3599 case Compare_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3600 return compiler_compare(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3601 case Call_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3602 return compiler_call(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3603 case Repr_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3604 VISIT(c, expr, e->v.Repr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3605 ADDOP(c, UNARY_CONVERT);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3606 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3607 case Num_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3608 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	3609 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3610 case Str_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3611 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	3612 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3613 /* The following exprs can be assignment targets. */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3614 case Attribute_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3615 if (e->v.Attribute.ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3616 VISIT(c, expr, e->v.Attribute.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3617 switch (e->v.Attribute.ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3618 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3619 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3620 /* Fall through to load */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3621 case Load:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3622 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	3623 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3624 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3625 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3626 /* Fall through to save */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3627 case Store:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3628 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	3629 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3630 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3631 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	3632 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3633 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3634 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3635 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3636 "param invalid in attribute expression");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3637 return 0;
35742 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 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3640 case Subscript_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3641 switch (e->v.Subscript.ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3642 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3643 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3644 VISIT_SLICE(c, e->v.Subscript.slice, AugLoad);
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 Load:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3647 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3648 VISIT_SLICE(c, e->v.Subscript.slice, Load);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3649 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3650 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3651 VISIT_SLICE(c, e->v.Subscript.slice, AugStore);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3652 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3653 case Store:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3654 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3655 VISIT_SLICE(c, e->v.Subscript.slice, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3656 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3657 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3658 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3659 VISIT_SLICE(c, e->v.Subscript.slice, Del);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3660 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3661 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3662 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3663 PyErr_SetString(PyExc_SystemError,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3664 "param invalid in subscript expression");
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3665 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3666 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3667 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3668 case Name_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3669 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	3670 /* child nodes of List and Tuple will have expr_context set */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3671 case List_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3672 return compiler_list(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3673 case Tuple_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3674 return compiler_tuple(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3675 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3676 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3677 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3680 compiler_augassign(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3681 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3682 expr_ty e = s->v.AugAssign.target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3683 expr_ty auge;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3684
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3685 assert(s->kind == AugAssign_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3686
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3687 switch (e->kind) {
38765 47d8d19ccadc Fix indentation of case and a Py_ssize_t issue. Neal Norwitz <nnorwitz@gmail.com> parents: 38588 diff changeset	3688 case Attribute_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3689 auge = Attribute(e->v.Attribute.value, e->v.Attribute.attr,
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36766 diff changeset	3690 AugLoad, e->lineno, e->col_offset, c->c_arena);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3691 if (auge == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3692 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3693 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3694 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3695 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	3696 auge->v.Attribute.ctx = AugStore;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3697 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3698 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3699 case Subscript_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3700 auge = Subscript(e->v.Subscript.value, e->v.Subscript.slice,
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36766 diff changeset	3701 AugLoad, e->lineno, e->col_offset, c->c_arena);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3702 if (auge == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3703 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3704 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3705 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3706 ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3707 auge->v.Subscript.ctx = AugStore;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3708 VISIT(c, expr, auge);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3709 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3710 case Name_kind:
39037 9f70f6ba7b69 Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38765 diff changeset	3711 if (!compiler_nameop(c, e->v.Name.id, Load))
9f70f6ba7b69 Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38765 diff changeset	3712 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3713 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3714 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	3715 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	3716 default:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3717 PyErr_Format(PyExc_SystemError,
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3718 "invalid node type (%d) for augmented assignment",
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3719 e->kind);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3720 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3721 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3722 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3723 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3724
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3725 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3726 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	3727 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3728 struct fblockinfo *f;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3729 if (c->u->u_nfblocks >= CO_MAXBLOCKS)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3730 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3731 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	3732 f->fb_type = t;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3733 f->fb_block = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3734 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3737 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3738 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	3739 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3740 struct compiler_unit *u = c->u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3741 assert(u->u_nfblocks > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3742 u->u_nfblocks--;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3743 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	3744 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	3745 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3746
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3747 /* Raises a SyntaxError and returns 0.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3748 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	3749 */
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3752 compiler_error(struct compiler c, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3753 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3754 PyObject *loc;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3755 PyObject u = NULL, v = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3756
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3757 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	3758 if (!loc) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3759 Py_INCREF(Py_None);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3760 loc = Py_None;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3761 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3762 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	3763 Py_None, loc);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3764 if (!u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3765 goto exit;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3766 v = Py_BuildValue("(zO)", errstr, u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3767 if (!v)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3768 goto exit;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3769 PyErr_SetObject(PyExc_SyntaxError, v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3770 exit:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3771 Py_DECREF(loc);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3772 Py_XDECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3773 Py_XDECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3774 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3775 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3776
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3777 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3778 compiler_handle_subscr(struct compiler c, const char kind,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3779 expr_context_ty ctx)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3780 {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3781 int op = 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3782
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3783 /* XXX this code is duplicated */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3784 switch (ctx) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3785 case AugLoad: /* fall through to Load */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3786 case Load: op = BINARY_SUBSCR; break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3787 case AugStore:/* fall through to Store */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3788 case Store: op = STORE_SUBSCR; break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3789 case Del: op = DELETE_SUBSCR; break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3790 case Param:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3791 PyErr_Format(PyExc_SystemError,
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3792 "invalid %s kind %d in subscript\n",
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3793 kind, ctx);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3794 return 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3795 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3796 if (ctx == AugLoad) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3797 ADDOP_I(c, DUP_TOPX, 2);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3798 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3799 else if (ctx == AugStore) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3800 ADDOP(c, ROT_THREE);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3801 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3802 ADDOP(c, op);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3803 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3804 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3805
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3806 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3807 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	3808 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3809 int n = 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3810 assert(s->kind == Slice_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3811
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3812 /* 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	3813 if (s->v.Slice.lower) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3814 VISIT(c, expr, s->v.Slice.lower);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3815 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3816 else {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3817 ADDOP_O(c, LOAD_CONST, Py_None, consts);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3818 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3819
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3820 if (s->v.Slice.upper) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3821 VISIT(c, expr, s->v.Slice.upper);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3822 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3823 else {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3824 ADDOP_O(c, LOAD_CONST, Py_None, consts);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3825 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3826
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3827 if (s->v.Slice.step) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3828 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3829 VISIT(c, expr, s->v.Slice.step);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3830 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3831 ADDOP_I(c, BUILD_SLICE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3832 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3833 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3834
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3835 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3836 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	3837 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3838 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	3839
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3840 assert(s->v.Slice.step == NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3841 if (s->v.Slice.lower) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3842 slice_offset++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3843 stack_count++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3844 if (ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3845 VISIT(c, expr, s->v.Slice.lower);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3846 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3847 if (s->v.Slice.upper) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3848 slice_offset += 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3849 stack_count++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3850 if (ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3851 VISIT(c, expr, s->v.Slice.upper);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3852 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3853
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3854 if (ctx == AugLoad) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3855 switch (stack_count) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3856 case 0: ADDOP(c, DUP_TOP); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3857 case 1: ADDOP_I(c, DUP_TOPX, 2); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3858 case 2: ADDOP_I(c, DUP_TOPX, 3); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3859 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3860 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3861 else if (ctx == AugStore) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3862 switch (stack_count) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3863 case 0: ADDOP(c, ROT_TWO); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3864 case 1: ADDOP(c, ROT_THREE); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3865 case 2: ADDOP(c, ROT_FOUR); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3866 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3867 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3868
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3869 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3870 case AugLoad: /* fall through to Load */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3871 case Load: op = SLICE; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3872 case AugStore:/* fall through to Store */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3873 case Store: op = STORE_SLICE; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3874 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	3875 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3876 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3877 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3878 "param invalid in simple slice");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3879 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3880 }
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 ADDOP(c, op + slice_offset);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3883 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3884 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3885
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3886 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3887 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	3888 expr_context_ty ctx)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3889 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3890 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3891 case Ellipsis_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3892 ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3893 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3894 case Slice_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3895 return compiler_slice(c, s, ctx);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3896 case Index_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3897 VISIT(c, expr, s->v.Index.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3898 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3899 case ExtSlice_kind:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3900 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3901 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3902 "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	3903 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3904 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3905 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3906 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3907
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3908
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3909 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3910 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	3911 {
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3912 char * kindname = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3913 switch (s->kind) {
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3914 case Index_kind:
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3915 kindname = "index";
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3916 if (ctx != AugStore) {
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3917 VISIT(c, expr, s->v.Index.value);
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3918 }
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3919 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3920 case Ellipsis_kind:
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3921 kindname = "ellipsis";
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3922 if (ctx != AugStore) {
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3923 ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3924 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3925 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3926 case Slice_kind:
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3927 kindname = "slice";
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3928 if (!s->v.Slice.step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3929 return compiler_simple_slice(c, s, ctx);
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3930 if (ctx != AugStore) {
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3931 if (!compiler_slice(c, s, ctx))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3932 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3933 }
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3934 break;
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3935 case ExtSlice_kind:
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3936 kindname = "extended slice";
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3937 if (ctx != AugStore) {
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3938 int i, n = asdl_seq_LEN(s->v.ExtSlice.dims);
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3939 for (i = 0; i < n; i++) {
37606 f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3940 slice_ty sub = (slice_ty)asdl_seq_GET(
f448d0075691 more low-hanging fruit to make code compile under a C++ compiler. Not Anthony Baxter <anthonybaxter@gmail.com> parents: 37558 diff changeset	3941 s->v.ExtSlice.dims, i);
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3942 if (!compiler_visit_nested_slice(c, sub, ctx))
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3943 return 0;
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3944 }
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3945 ADDOP_I(c, BUILD_TUPLE, n);
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3946 }
9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3947 break;
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3948 default:
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3949 PyErr_Format(PyExc_SystemError,
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3950 "invalid subscript kind %d", s->kind);
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3951 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3952 }
36965 9a08724110d0 Fix SF bug #1448804 and ad a test to ensure that all subscript operations continue to be handled correctly Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	3953 return compiler_handle_subscr(c, kindname, ctx);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3954 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3955
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3956 /* 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	3957 post records the block indices in post-order.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3958
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3959 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	3960 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3961
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3962 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3963 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	3964 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3965 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3966 struct instr *instr = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3967
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3968 if (b->b_seen)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3969 return;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3970 b->b_seen = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3971 if (b->b_next != NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3972 dfs(c, b->b_next, a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3973 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3974 instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3975 if (instr->i_jrel \|\| instr->i_jabs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3976 dfs(c, instr->i_target, a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3977 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3978 a->a_postorder[a->a_nblocks++] = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3979 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3980
35860 9b885c934144 make internal method static Neal Norwitz <nnorwitz@gmail.com> parents: 35797 diff changeset	3981 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3982 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	3983 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3984 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3985 struct instr *instr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3986 if (b->b_seen \|\| b->b_startdepth >= depth)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3987 return maxdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3988 b->b_seen = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3989 b->b_startdepth = depth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3990 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3991 instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3992 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	3993 if (depth > maxdepth)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3994 maxdepth = depth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3995 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	3996 if (instr->i_jrel \|\| instr->i_jabs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3997 maxdepth = stackdepth_walk(c, instr->i_target,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3998 depth, maxdepth);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3999 if (instr->i_opcode == JUMP_ABSOLUTE \|\|
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4000 instr->i_opcode == JUMP_FORWARD) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4001 goto out; /* remaining code is dead */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4002 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4003 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4004 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4005 if (b->b_next)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4006 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	4007 out:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4008 b->b_seen = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4009 return maxdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4010 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4011
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4012 /* 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	4013 * 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	4014 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4015 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4016 stackdepth(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4017 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4018 basicblock b, entryblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4019 entryblock = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4020 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	4021 b->b_seen = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4022 b->b_startdepth = INT_MIN;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4023 entryblock = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4024 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4025 return stackdepth_walk(c, entryblock, 0, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4026 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4027
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4028 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4029 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	4030 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4031 memset(a, 0, sizeof(struct assembler));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4032 a->a_lineno = firstlineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4033 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	4034 if (!a->a_bytecode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4035 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4036 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	4037 if (!a->a_lnotab)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4038 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4039 a->a_postorder = (basicblock **)PyObject_Malloc(
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4040 sizeof(basicblock ) nblocks);
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	4041 if (!a->a_postorder) {
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	4042 PyErr_NoMemory();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4043 return 0;
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	4044 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4045 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4046 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4047
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4048 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4049 assemble_free(struct assembler *a)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4050 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4051 Py_XDECREF(a->a_bytecode);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4052 Py_XDECREF(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4053 if (a->a_postorder)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4054 PyObject_Free(a->a_postorder);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4055 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4056
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4057 /* 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	4058
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4059 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4060 instrsize(struct instr *instr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4061 {
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	4062 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	4063 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	4064 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	4065 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	4066 return 3;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4067 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4068
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4069 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4070 blocksize(basicblock *b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4071 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4072 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4073 int size = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4074
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4075 for (i = 0; i < b->b_iused; i++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4076 size += instrsize(&b->b_instr[i]);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4077 return size;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4078 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4079
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4080 /* All about a_lnotab.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4081
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4082 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	4083 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	4084 for tracebacks).
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	4085
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4086 The array is conceptually a list of
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4087 (bytecode offset increment, line number increment)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4088 pairs. The details are important and delicate, best illustrated by example:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4089
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4090 byte code offset source code line number
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4091 0 1
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4092 6 2
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4093 50 7
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4094 350 307
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4095 361 308
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4096
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4097 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	4098 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	4099
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4100 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	4101
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4102 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	4103 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	4104 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	4105 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	4106 than one pair is written to the table. In case #b, there's no way to know
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4107 from looking at the table later how many were written. That's the delicate
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4108 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	4109 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	4110
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4111 lineno = addr = 0
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4112 for addr_incr, line_incr in c_lnotab:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4113 addr += addr_incr
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4114 if addr > A:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4115 return lineno
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4116 lineno += line_incr
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4117
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4118 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	4119 the line # increment in each pair generated must be 0 until the remaining addr
39094 756d57acda85 Bug #1512814, Fix incorrect lineno's when code within a function Neal Norwitz <nnorwitz@gmail.com> parents: 39040 diff changeset	4120 increment is < 256. So, in the example above, assemble_lnotab (it used
756d57acda85 Bug #1512814, Fix incorrect lineno's when code within a function Neal Norwitz <nnorwitz@gmail.com> parents: 39040 diff changeset	4121 to be called com_set_lineno) should not (as was actually done until 2.2)
756d57acda85 Bug #1512814, Fix incorrect lineno's when code within a function Neal Norwitz <nnorwitz@gmail.com> parents: 39040 diff changeset	4122 expand 300, 300 to 255, 255, 45, 45,
756d57acda85 Bug #1512814, Fix incorrect lineno's when code within a function Neal Norwitz <nnorwitz@gmail.com> parents: 39040 diff changeset	4123 but to 255, 0, 45, 255, 0, 45.
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4124 */
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4125
17518 f939ce52a734 Make some private symbols static. Guido van Rossum <guido@python.org> parents: 17355 diff changeset	4126 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4127 assemble_lnotab(struct assembler a, struct instr i)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4128 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4129 int d_bytecode, d_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4130 int len;
37555 231e42d0362e Fix some warnings on HP-UX when using cc/aCC Neal Norwitz <nnorwitz@gmail.com> parents: 37468 diff changeset	4131 unsigned char *lnotab;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4132
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4133 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	4134 d_lineno = i->i_lineno - a->a_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4135
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4136 assert(d_bytecode >= 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4137 assert(d_lineno >= 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4138
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4139 if (d_lineno == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4140 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4141
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4142 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	4143 int j, nbytes, ncodes = d_bytecode / 255;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4144 nbytes = a->a_lnotab_off + 2 * ncodes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4145 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4146 if (nbytes >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4147 if (len * 2 < nbytes)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4148 len = nbytes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4149 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4150 len *= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4151 if (_PyString_Resize(&a->a_lnotab, len) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4152 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4153 }
37555 231e42d0362e Fix some warnings on HP-UX when using cc/aCC Neal Norwitz <nnorwitz@gmail.com> parents: 37468 diff changeset	4154 lnotab = (unsigned char *)
231e42d0362e Fix some warnings on HP-UX when using cc/aCC Neal Norwitz <nnorwitz@gmail.com> parents: 37468 diff changeset	4155 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	4156 for (j = 0; j < ncodes; j++) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4157 *lnotab++ = 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4158 *lnotab++ = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4159 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4160 d_bytecode -= ncodes * 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4161 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	4162 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4163 assert(d_bytecode <= 255);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4164 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	4165 int j, nbytes, ncodes = d_lineno / 255;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4166 nbytes = a->a_lnotab_off + 2 * ncodes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4167 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4168 if (nbytes >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4169 if (len * 2 < nbytes)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4170 len = nbytes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4171 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4172 len *= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4173 if (_PyString_Resize(&a->a_lnotab, len) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4174 return 0;
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	4175 }
37555 231e42d0362e Fix some warnings on HP-UX when using cc/aCC Neal Norwitz <nnorwitz@gmail.com> parents: 37468 diff changeset	4176 lnotab = (unsigned char *)
231e42d0362e Fix some warnings on HP-UX when using cc/aCC Neal Norwitz <nnorwitz@gmail.com> parents: 37468 diff changeset	4177 PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
39094 756d57acda85 Bug #1512814, Fix incorrect lineno's when code within a function Neal Norwitz <nnorwitz@gmail.com> parents: 39040 diff changeset	4178 *lnotab++ = d_bytecode;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4179 *lnotab++ = 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4180 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	4181 for (j = 1; j < ncodes; j++) {
39094 756d57acda85 Bug #1512814, Fix incorrect lineno's when code within a function Neal Norwitz <nnorwitz@gmail.com> parents: 39040 diff changeset	4182 *lnotab++ = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4183 *lnotab++ = 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4184 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4185 d_lineno -= ncodes * 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4186 a->a_lnotab_off += ncodes * 2;
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	4187 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4188
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4189 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4190 if (a->a_lnotab_off + 2 >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4191 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	4192 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4193 }
37555 231e42d0362e Fix some warnings on HP-UX when using cc/aCC Neal Norwitz <nnorwitz@gmail.com> parents: 37468 diff changeset	4194 lnotab = (unsigned char *)
231e42d0362e Fix some warnings on HP-UX when using cc/aCC Neal Norwitz <nnorwitz@gmail.com> parents: 37468 diff changeset	4195 PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4196
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4197 a->a_lnotab_off += 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4198 if (d_bytecode) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4199 *lnotab++ = d_bytecode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4200 *lnotab++ = d_lineno;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4201 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4202 else { /* First line of a block; def stmt, etc. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4203 *lnotab++ = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4204 *lnotab++ = d_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4205 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4206 a->a_lineno = i->i_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4207 a->a_lineno_off = a->a_offset;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4208 return 1;
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4209 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	4210
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4211 /* assemble_emit()
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4212 Extend the bytecode with a new instruction.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4213 Update lnotab if necessary.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4214 */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4215
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	4216 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4217 assemble_emit(struct assembler a, struct instr i)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4218 {
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	4219 int size, arg = 0, ext = 0;
38765 47d8d19ccadc Fix indentation of case and a Py_ssize_t issue. Neal Norwitz <nnorwitz@gmail.com> parents: 38588 diff changeset	4220 Py_ssize_t len = PyString_GET_SIZE(a->a_bytecode);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4221 char *code;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4222
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	4223 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	4224 if (i->i_hasarg) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4225 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	4226 ext = arg >> 16;
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	4227 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4228 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	4229 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4230 if (a->a_offset + size >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4231 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	4232 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	4233 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4234 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	4235 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	4236 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	4237 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	4238 *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	4239 *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	4240 *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	4241 arg &= 0xffff;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	4242 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4243 *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	4244 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	4245 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	4246 *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	4247 *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	4248 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4249 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	4250 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	4251
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	4252 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4253 assemble_jump_offsets(struct assembler a, struct compiler c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4254 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4255 basicblock *b;
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4256 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	4257 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4258
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4259 /* 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	4260 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	4261 start:
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4262 totsize = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4263 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	4264 b = a->a_postorder[i];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4265 bsize = blocksize(b);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4266 b->b_offset = totsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4267 totsize += bsize;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	4268 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4269 extended_arg_count = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4270 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	4271 bsize = b->b_offset;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4272 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4273 struct instr *instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4274 /* Relative jumps are computed relative to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4275 the instruction pointer after fetching
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4276 the jump instruction.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4277 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4278 bsize += instrsize(instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4279 if (instr->i_jabs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4280 instr->i_oparg = instr->i_target->b_offset;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4281 else if (instr->i_jrel) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4282 int delta = instr->i_target->b_offset - bsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4283 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	4284 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4285 else
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4286 continue;
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4287 if (instr->i_oparg > 0xffff)
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4288 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	4289 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	4290 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4291
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4292 /* XXX: This is an awful hack that could hurt performance, but
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4293 on the bright side it should work until we come up
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4294 with a better solution.
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4295
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4296 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	4297 of a loop?
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4298
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4299 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	4300 which calls instrsize() which requires i_oparg be set
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4301 appropriately. There is a bootstrap problem because
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4302 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	4303
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4304 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	4305 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	4306 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	4307 fairly quickly.
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4308 */
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4309 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	4310 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	4311 goto start;
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	4312 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4313 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4314
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4315 static PyObject *
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4316 dict_keys_inorder(PyObject *dict, int offset)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4317 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4318 PyObject tuple, k, *v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	4319 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	4320
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4321 tuple = PyTuple_New(size);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4322 if (tuple == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4323 return NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4324 while (PyDict_Next(dict, &pos, &k, &v)) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4325 i = PyInt_AS_LONG(v);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4326 k = PyTuple_GET_ITEM(k, 0);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4327 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	4328 assert((i - offset) < size);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4329 assert((i - offset) >= 0);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4330 PyTuple_SET_ITEM(tuple, i - offset, k);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4331 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4332 return tuple;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4333 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4334
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4335 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4336 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	4337 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4338 PySTEntryObject *ste = c->u->u_ste;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4339 int flags = 0, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4340 if (ste->ste_type != ModuleBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4341 flags \|= CO_NEWLOCALS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4342 if (ste->ste_type == FunctionBlock) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4343 if (!ste->ste_unoptimized)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4344 flags \|= CO_OPTIMIZED;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4345 if (ste->ste_nested)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4346 flags \|= CO_NESTED;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4347 if (ste->ste_generator)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4348 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	4349 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4350 if (ste->ste_varargs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4351 flags \|= CO_VARARGS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4352 if (ste->ste_varkeywords)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4353 flags \|= CO_VARKEYWORDS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4354 if (ste->ste_generator)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4355 flags \|= CO_GENERATOR;
36729 d6cbc71b8010 Generally inehrit codeflags that are in PyCF_MASK, instead of writing it out Thomas Wouters <thomas@python.org> parents: 36726 diff changeset	4356
d6cbc71b8010 Generally inehrit codeflags that are in PyCF_MASK, instead of writing it out Thomas Wouters <thomas@python.org> parents: 36726 diff changeset	4357 /* (Only) inherit compilerflags in PyCF_MASK */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4358 flags \|= (c->c_flags->cf_flags & PyCF_MASK);
36729 d6cbc71b8010 Generally inehrit codeflags that are in PyCF_MASK, instead of writing it out Thomas Wouters <thomas@python.org> parents: 36726 diff changeset	4359
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4360 n = PyDict_Size(c->u->u_freevars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4361 if (n < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4362 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4363 if (n == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4364 n = PyDict_Size(c->u->u_cellvars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4365 if (n < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4366 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4367 if (n == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4368 flags \|= CO_NOFREE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4369 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4370 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4371
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4372 return flags;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4373 }
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4374
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4375 static PyCodeObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4376 makecode(struct compiler c, struct assembler a)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4377 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4378 PyObject *tmp;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4379 PyCodeObject *co = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4380 PyObject *consts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4381 PyObject *names = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4382 PyObject *varnames = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4383 PyObject *filename = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4384 PyObject *name = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4385 PyObject *freevars = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4386 PyObject *cellvars = NULL;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4387 PyObject *bytecode = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4388 int nlocals, flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4389
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4390 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	4391 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4392 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4393 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	4394 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4395
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4396 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	4397 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	4398 if (!consts \|\| !names \|\| !varnames)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4399 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4400
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4401 cellvars = dict_keys_inorder(c->u->u_cellvars, 0);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4402 if (!cellvars)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4403 goto error;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4404 freevars = dict_keys_inorder(c->u->u_freevars, PyTuple_Size(cellvars));
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4405 if (!freevars)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4406 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4407 filename = PyString_FromString(c->c_filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4408 if (!filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4409 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4410
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	4411 nlocals = PyDict_Size(c->u->u_varnames);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4412 flags = compute_code_flags(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4413 if (flags < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4414 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4415
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4416 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	4417 if (!bytecode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4418 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4419
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4420 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	4421 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4422 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4423 Py_DECREF(consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4424 consts = tmp;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4425
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4426 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	4427 bytecode, consts, names, varnames,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4428 freevars, cellvars,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4429 filename, c->u->u_name,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4430 c->u->u_firstlineno,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4431 a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4432 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4433 Py_XDECREF(consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4434 Py_XDECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4435 Py_XDECREF(varnames);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4436 Py_XDECREF(filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4437 Py_XDECREF(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4438 Py_XDECREF(freevars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4439 Py_XDECREF(cellvars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4440 Py_XDECREF(bytecode);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4441 return co;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4442 }
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4443
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4444 static PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4445 assemble(struct compiler *c, int addNone)
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4446 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4447 basicblock b, entryblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4448 struct assembler a;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4449 int i, j, nblocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4450 PyCodeObject *co = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4451
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4452 /* 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	4453 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	4454 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	4455 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4456 if (!c->u->u_curblock->b_return) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4457 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4458 if (addNone)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4459 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4460 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	4461 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4462
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4463 nblocks = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4464 entryblock = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4465 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	4466 nblocks++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4467 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	4468 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4469
39040 ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	4470 /* Set firstlineno if it wasn't explicitly set. */
ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	4471 if (!c->u->u_firstlineno) {
ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	4472 if (entryblock && entryblock->b_instr)
ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	4473 c->u->u_firstlineno = entryblock->b_instr->i_lineno;
ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	4474 else
ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	4475 c->u->u_firstlineno = 1;
ca3d9a67126b Bug #1512814, Fix incorrect lineno's when code at module scope Neal Norwitz <nnorwitz@gmail.com> parents: 39037 diff changeset	4476 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4477 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	4478 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4479 dfs(c, entryblock, &a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4480
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4481 /* 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	4482 assemble_jump_offsets(&a, c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4483
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4484 /* Emit code in reverse postorder from dfs. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4485 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	4486 b = a.a_postorder[i];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4487 for (j = 0; j < b->b_iused; j++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4488 if (!assemble_emit(&a, &b->b_instr[j]))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4489 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	4490 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4491
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4492 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	4493 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4494 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	4495 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4496
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4497 co = makecode(c, &a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4498 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4499 assemble_free(&a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4500 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	4501 }

Mercurial > cpython-lru_cache-weakref

annotate Python/compile.c @ 39135:12e973bdfeee legacy-trunk