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

annotate Python/compile.c @ 40894:0ea24f4f2467

Bytes literal.

author	Thomas Wouters <thomas@python.org>
date	Fri, 23 Feb 2007 19:56:57 +0000
parents	e9a6234b26af
children	2ca14d6a369b

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.
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 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
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	11 * this file.
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	12 * 5. Optimize the byte code (peephole optimizations). See peephole.c
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	13 *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	14 * 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	15 * (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	16 *
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	17 * 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	18 * 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	19 * which needs to be released. Code blocks are OK, as the compiler
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	20 * structure takes care of releasing those. Use the arena to manage
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	21 * objects.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	22 */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	23
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	24 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	25
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	26 #include "Python-ast.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	27 #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	28 #include "pyarena.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	29 #include "ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	30 #include "code.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31 #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	32 #include "symtable.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	33 #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	34
5164 8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	35 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	36
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	37 #define DEFAULT_BLOCK_SIZE 16
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	38 #define DEFAULT_BLOCKS 8
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	39 #define DEFAULT_CODE_SIZE 128
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	40 #define DEFAULT_LNOTAB_SIZE 16
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	41
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	42 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	43 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	44 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	45 unsigned i_hasarg : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	46 unsigned char i_opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	47 int i_oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	48 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	49 int i_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	50 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	51
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	52 typedef struct basicblock_ {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	53 /* Each basicblock in a compilation unit is linked via b_list in the
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	54 reverse order that the block are allocated. b_list points to the next
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	55 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	56 struct basicblock_ *b_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	57 /* number of instructions used */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	58 int b_iused;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	59 /* length of instruction array (b_instr) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	60 int b_ialloc;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	61 /* pointer to an array of instructions, initially NULL */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	62 struct instr *b_instr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	63 /* 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	64 block reached by normal control flow. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	65 struct basicblock_ *b_next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	66 /* 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	67 unsigned b_seen : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	68 /* 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	69 unsigned b_return : 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	70 /* 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	71 int b_startdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	72 /* 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	73 int b_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	74 } basicblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	75
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	76 /* fblockinfo tracks the current frame block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	77
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	78 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	79 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	80 compiler IR.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	81 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	82
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	83 enum fblocktype { LOOP, EXCEPT, FINALLY_TRY, FINALLY_END };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	84
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	85 struct fblockinfo {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	86 enum fblocktype fb_type;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	87 basicblock *fb_block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	88 };
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 /* 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	91 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	92 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	93 struct compiler_unit {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	94 PySTEntryObject *u_ste;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	95
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	96 PyObject *u_name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	97 /* 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	98 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	99 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	100 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	101 PyObject u_consts; / all constants */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	102 PyObject u_names; / all names */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	103 PyObject u_varnames; / local variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	104 PyObject u_cellvars; / cell variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	105 PyObject u_freevars; / free variables */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	106
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	107 PyObject u_private; / for private name mangling */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	108
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	109 int u_argcount; /* number of arguments for block */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	110 int u_kwonlyargcount; /* number of keyword only arguments for block */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	111 /* Pointer to the most recently allocated block. By following b_list
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	112 members, you can reach all early allocated blocks. */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	113 basicblock *u_blocks;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	114 basicblock u_curblock; / pointer to current block */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	115 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	116
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	117 int u_nfblocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	118 struct fblockinfo u_fblock[CO_MAXBLOCKS];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	119
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	120 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	121 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	122 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	123 has been generated with current lineno */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	124 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	125
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	126 /* 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	127
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	128 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	129 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	130 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	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 struct compiler {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	134 const char *c_filename;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	135 struct symtable *c_st;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	136 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	137 PyCompilerFlags *c_flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	138
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	139 int c_interactive; /* true if in interactive mode */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	140 int c_nestlevel;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	141
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	142 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	143 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	144 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	145 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	146 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	147
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	148 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	149 static void compiler_free(struct compiler *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	150 static basicblock compiler_new_block(struct compiler );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	151 static int compiler_next_instr(struct compiler , basicblock );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	152 static int compiler_addop(struct compiler *, int);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	153 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	154 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	155 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	156 static basicblock compiler_use_new_block(struct compiler );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	157 static int compiler_error(struct compiler , const char );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	158 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	159
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	160 static PyCodeObject compiler_mod(struct compiler , mod_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	161 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	162 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	163 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	164 static int compiler_augassign(struct compiler *, stmt_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	165 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	166 expr_context_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	167
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	168 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	169 basicblock *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	170 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	171 basicblock *);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	172 /* Returns true if there is a loop on the fblock stack. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	173 static int compiler_in_loop(struct compiler *);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	174
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	175 static int inplace_binop(struct compiler *, operator_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	176 static int expr_constant(expr_ty e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	177
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	178 static int compiler_with(struct compiler *, stmt_ty);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	179
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	180 static PyCodeObject assemble(struct compiler , int addNone);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	181 static PyObject *__doc__;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	182
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	183 PyObject *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	184 _Py_Mangle(PyObject privateobj, PyObject ident)
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	185 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	186 /* Name mangling: __private becomes _classname__private.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	187 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	188 const char p, name = PyString_AsString(ident);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	189 char *buffer;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	190 size_t nlen, plen;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	191 if (privateobj == NULL \|\| !PyString_Check(privateobj) \|\|
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	192 name == NULL \|\| name[0] != '_' \|\| name[1] != '_') {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	193 Py_INCREF(ident);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	194 return ident;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	195 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	196 p = PyString_AsString(privateobj);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	197 nlen = strlen(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	198 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	199 Py_INCREF(ident);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	200 return ident; /* Don't mangle __whatever__ */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	201 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	202 /* Strip leading underscores from class name */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	203 while (*p == '_')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	204 p++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	205 if (*p == '\0') {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	206 Py_INCREF(ident);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	207 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	208 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	209 plen = strlen(p);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	210 ident = PyString_FromStringAndSize(NULL, 1 + nlen + plen);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	211 if (!ident)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	212 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	213 /* 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	214 buffer = PyString_AS_STRING(ident);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	215 buffer[0] = '_';
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	216 strncpy(buffer+1, p, plen);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	217 strcpy(buffer+1+plen, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	218 return ident;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	219 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	220
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	221 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	222 compiler_init(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	223 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	224 memset(c, 0, sizeof(struct compiler));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	225
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	226 c->c_stack = PyList_New(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	227 if (!c->c_stack)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	228 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	229
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	230 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	231 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	232
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	233 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	234 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	235 PyArena *arena)
35742 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 struct compiler c;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	238 PyCodeObject *co = NULL;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	239 PyCompilerFlags local_flags;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	240 int merged;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	241
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	242 if (!__doc__) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	243 __doc__ = PyString_InternFromString("__doc__");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	244 if (!__doc__)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	245 return NULL;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	246 }
35742 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 if (!compiler_init(&c))
36696 e0a77010d033 Fix assertions. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	249 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	250 c.c_filename = filename;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	251 c.c_arena = arena;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	252 c.c_future = PyFuture_FromAST(mod, filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	253 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	254 goto finally;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	255 if (!flags) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	256 local_flags.cf_flags = 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	257 flags = &local_flags;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	258 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	259 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	260 c.c_future->ff_features = merged;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	261 flags->cf_flags = merged;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	262 c.c_flags = flags;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	263 c.c_nestlevel = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	264
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	265 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	266 if (c.c_st == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	267 if (!PyErr_Occurred())
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	268 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	269 goto finally;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	270 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	271
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	272 /* 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	273 c.c_encoding = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	274
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	275 co = compiler_mod(&c, mod);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	276
36697 78de5f6b2f67 Clarify C-style exception handling with proper label name. Thomas Wouters <thomas@python.org> parents: 36696 diff changeset	277 finally:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	278 compiler_free(&c);
36696 e0a77010d033 Fix assertions. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	279 assert(co \|\| PyErr_Occurred());
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	280 return co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	281 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	282
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	283 PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	284 PyNode_Compile(struct _node n, const char filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	285 {
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	286 PyCodeObject *co = NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	287 mod_ty mod;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	288 PyArena *arena = PyArena_New();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	289 if (!arena)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	290 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	291 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	292 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	293 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	294 PyArena_Free(arena);
30428 c2c10f1eb8e2 Fix leak discovered in test_new by Michael Hudson. Raymond Hettinger <python@rcn.com> parents: 30226 diff changeset	295 return co;
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	296 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	297
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	298 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	299 compiler_free(struct compiler *c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	300 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	301 if (c->c_st)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	302 PySymtable_Free(c->c_st);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	303 if (c->c_future)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	304 PyObject_Free(c->c_future);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	305 Py_DECREF(c->c_stack);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	306 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	307
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	308 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	309 list2dict(PyObject *list)
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	310 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	311 Py_ssize_t i, n;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	312 PyObject v, k;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	313 PyObject *dict = PyDict_New();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	314 if (!dict) return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	315
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	316 n = PyList_Size(list);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	317 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	318 v = PyInt_FromLong(i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	319 if (!v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	320 Py_DECREF(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	321 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	322 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	323 k = PyList_GET_ITEM(list, i);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	324 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	325 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	326 Py_XDECREF(k);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	327 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	328 Py_DECREF(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	329 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	330 }
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	331 Py_DECREF(k);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	332 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	333 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	334 return dict;
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	335 }
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	336
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	337 /* 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	338
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	339 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	340 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	341 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	342 each key.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	343 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	344
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	345 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	346 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	347 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	348 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	349 PyObject k, v, *dest = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	350
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	351 assert(offset >= 0);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	352 if (dest == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	353 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	354
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	355 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	356 /* 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	357 assert(PyInt_Check(v));
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	358 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	359
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	360 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	361 PyObject tuple, item = PyInt_FromLong(i);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	362 if (item == NULL) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	363 Py_DECREF(dest);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	364 return NULL;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	365 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	366 i++;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	367 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	368 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	369 Py_DECREF(item);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	370 Py_DECREF(dest);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	371 Py_XDECREF(tuple);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	372 return NULL;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	373 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	374 Py_DECREF(item);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	375 Py_DECREF(tuple);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	376 }
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	377 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	378 return dest;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	379 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	380
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	381 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	382 compiler_unit_check(struct compiler_unit *u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	383 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	384 basicblock *block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	385 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	386 assert(block != (void *)0xcbcbcbcb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	387 assert(block != (void *)0xfbfbfbfb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	388 assert(block != (void *)0xdbdbdbdb);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	389 if (block->b_instr != NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	390 assert(block->b_ialloc > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	391 assert(block->b_iused > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	392 assert(block->b_ialloc >= block->b_iused);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	393 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	394 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	395 assert (block->b_iused == 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	396 assert (block->b_ialloc == 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	397 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	398 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	399 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	400
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	401 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	402 compiler_unit_free(struct compiler_unit *u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	403 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	404 basicblock b, next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	405
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	406 compiler_unit_check(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	407 b = u->u_blocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	408 while (b != NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	409 if (b->b_instr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	410 PyObject_Free((void *)b->b_instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	411 next = b->b_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	412 PyObject_Free((void *)b);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	413 b = next;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	414 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	415 Py_CLEAR(u->u_ste);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	416 Py_CLEAR(u->u_name);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	417 Py_CLEAR(u->u_consts);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	418 Py_CLEAR(u->u_names);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	419 Py_CLEAR(u->u_varnames);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	420 Py_CLEAR(u->u_freevars);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	421 Py_CLEAR(u->u_cellvars);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	422 Py_CLEAR(u->u_private);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	423 PyObject_Free(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	424 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	425
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	426 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	427 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	428 int lineno)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	429 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	430 struct compiler_unit *u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	431
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	432 u = (struct compiler_unit *)PyObject_Malloc(sizeof(
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	433 struct compiler_unit));
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	434 if (!u) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	435 PyErr_NoMemory();
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	436 return 0;
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	437 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	438 memset(u, 0, sizeof(struct compiler_unit));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	439 u->u_argcount = 0;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	440 u->u_kwonlyargcount = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	441 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	442 if (!u->u_ste) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	443 compiler_unit_free(u);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	444 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	445 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	446 Py_INCREF(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	447 u->u_name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	448 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	449 u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	450 if (!u->u_varnames \|\| !u->u_cellvars) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	451 compiler_unit_free(u);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	452 return 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	453 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	454
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	455 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	456 PyDict_Size(u->u_cellvars));
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	457 if (!u->u_freevars) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	458 compiler_unit_free(u);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	459 return 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	460 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	461
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	462 u->u_blocks = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	463 u->u_tmpname = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	464 u->u_nfblocks = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	465 u->u_firstlineno = lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	466 u->u_lineno = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	467 u->u_lineno_set = false;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	468 u->u_consts = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	469 if (!u->u_consts) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	470 compiler_unit_free(u);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	471 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	472 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	473 u->u_names = PyDict_New();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	474 if (!u->u_names) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	475 compiler_unit_free(u);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	476 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	477 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	478
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	479 u->u_private = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	480
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	481 /* Push the old compiler_unit on the stack. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	482 if (c->u) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	483 PyObject *wrapper = PyCObject_FromVoidPtr(c->u, NULL);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	484 if (!wrapper \|\| PyList_Append(c->c_stack, wrapper) < 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	485 Py_XDECREF(wrapper);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	486 compiler_unit_free(u);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	487 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	488 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	489 Py_DECREF(wrapper);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	490 u->u_private = c->u->u_private;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	491 Py_XINCREF(u->u_private);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	492 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	493 c->u = u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	494
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	495 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	496 if (compiler_use_new_block(c) == NULL)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	497 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	498
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	499 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	500 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	501
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	502 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	503 compiler_exit_scope(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	504 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	505 int n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	506 PyObject *wrapper;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	507
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	508 c->c_nestlevel--;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	509 compiler_unit_free(c->u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	510 /* Restore c->u to the parent unit. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	511 n = PyList_GET_SIZE(c->c_stack) - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	512 if (n >= 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	513 wrapper = PyList_GET_ITEM(c->c_stack, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	514 c->u = (struct compiler_unit *)PyCObject_AsVoidPtr(wrapper);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	515 assert(c->u);
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	516 /* 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	517 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	518 Py_FatalError("compiler_exit_scope()");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	519 compiler_unit_check(c->u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	520 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	521 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	522 c->u = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	523
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	524 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	525
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	526 /* Allocate a new "anonymous" local variable.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	527 Used by list comprehensions and with statements.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	528 */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	529
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	530 static PyObject *
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	531 compiler_new_tmpname(struct compiler *c)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	532 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	533 char tmpname[256];
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	534 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	535 return PyString_FromString(tmpname);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	536 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	537
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	538 /* 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	539 Returns NULL on error.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	540 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	541
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	542 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	543 compiler_new_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	544 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	545 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	546 struct compiler_unit *u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	547
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	548 u = c->u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	549 b = (basicblock *)PyObject_Malloc(sizeof(basicblock));
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	550 if (b == NULL) {
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	551 PyErr_NoMemory();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	552 return NULL;
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	553 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	554 memset((void *)b, 0, sizeof(basicblock));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	555 /* 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	556 b->b_list = u->u_blocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	557 u->u_blocks = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	558 return b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	559 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	560
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	561 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	562 compiler_use_new_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	563 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	564 basicblock *block = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	565 if (block == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	566 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	567 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	568 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	569 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	570
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	571 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	572 compiler_next_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	573 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	574 basicblock *block = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	575 if (block == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	576 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	577 c->u->u_curblock->b_next = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	578 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	579 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	580 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	581
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	582 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	583 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	584 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	585 assert(block != NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	586 c->u->u_curblock->b_next = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	587 c->u->u_curblock = block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	588 return block;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	589 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	590
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	591 /* 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	592 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	593 Returns -1 on failure.
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	594 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	595
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	596 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	597 compiler_next_instr(struct compiler c, basicblock b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	598 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	599 assert(b != NULL);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	600 if (b->b_instr == NULL) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	601 b->b_instr = (struct instr *)PyObject_Malloc(
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	602 sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	603 if (b->b_instr == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	604 PyErr_NoMemory();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	605 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	606 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	607 b->b_ialloc = DEFAULT_BLOCK_SIZE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	608 memset((char *)b->b_instr, 0,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	609 sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	610 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	611 else if (b->b_iused == b->b_ialloc) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	612 struct instr *tmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	613 size_t oldsize, newsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	614 oldsize = b->b_ialloc * sizeof(struct instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	615 newsize = oldsize << 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	616 if (newsize == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	617 PyErr_NoMemory();
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	618 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	619 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	620 b->b_ialloc <<= 1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	621 tmp = (struct instr *)PyObject_Realloc(
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	622 (void *)b->b_instr, newsize);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	623 if (tmp == NULL) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	624 PyErr_NoMemory();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	625 return -1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	626 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	627 b->b_instr = tmp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	628 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	629 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	630 return b->b_iused++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	631 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	632
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	633 /* Set the i_lineno member of the instruction at offse off if the
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	634 line number for the current expression/statement (?) has not
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	635 already been set. If it has been set, the call has no effect.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	636
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	637 Every time a new node is b
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	638 */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	639
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	640 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	641 compiler_set_lineno(struct compiler *c, int off)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	642 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	643 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	644 if (c->u->u_lineno_set)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	645 return;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	646 c->u->u_lineno_set = true;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	647 b = c->u->u_curblock;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	648 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	649 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	650
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	651 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	652 opcode_stack_effect(int opcode, int oparg)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	653 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	654 switch (opcode) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	655 case POP_TOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	656 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	657 case ROT_TWO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	658 case ROT_THREE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	659 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	660 case DUP_TOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	661 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	662 case ROT_FOUR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	663 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	664
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	665 case UNARY_POSITIVE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	666 case UNARY_NEGATIVE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	667 case UNARY_NOT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	668 case UNARY_INVERT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	669 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	670
36824 07f330ad1b47 SF bug 1442442: LIST_APPEND optimization got lost in the AST merge. Neal Norwitz <nnorwitz@gmail.com> parents: 36804 diff changeset	671 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	672 return -2;
07f330ad1b47 SF bug 1442442: LIST_APPEND optimization got lost in the AST merge. Neal Norwitz <nnorwitz@gmail.com> parents: 36804 diff changeset	673
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	674 case BINARY_POWER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	675 case BINARY_MULTIPLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	676 case BINARY_MODULO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	677 case BINARY_ADD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	678 case BINARY_SUBTRACT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	679 case BINARY_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	680 case BINARY_FLOOR_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	681 case BINARY_TRUE_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	682 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	683 case INPLACE_FLOOR_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	684 case INPLACE_TRUE_DIVIDE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	685 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	686
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	687 case SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	688 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	689 case SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	690 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	691 case SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	692 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	693 case SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	694 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	695
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	696 case STORE_SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	697 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	698 case STORE_SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	699 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	700 case STORE_SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	701 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	702 case STORE_SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	703 return -4;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	704
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	705 case DELETE_SLICE+0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	706 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	707 case DELETE_SLICE+1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	708 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	709 case DELETE_SLICE+2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	710 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	711 case DELETE_SLICE+3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	712 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	713
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	714 case INPLACE_ADD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	715 case INPLACE_SUBTRACT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	716 case INPLACE_MULTIPLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	717 case INPLACE_MODULO:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	718 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	719 case STORE_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	720 return -3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	721 case DELETE_SUBSCR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	722 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	723
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	724 case BINARY_LSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	725 case BINARY_RSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	726 case BINARY_AND:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	727 case BINARY_XOR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	728 case BINARY_OR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	729 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	730 case INPLACE_POWER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	731 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	732 case GET_ITER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	733 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	734
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	735 case PRINT_EXPR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	736 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	737 case INPLACE_LSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	738 case INPLACE_RSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	739 case INPLACE_AND:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	740 case INPLACE_XOR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	741 case INPLACE_OR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	742 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	743 case BREAK_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	744 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	745 case WITH_CLEANUP:
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36824 diff changeset	746 return -1; /* XXX Sometimes more */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	747 case LOAD_LOCALS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	748 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	749 case RETURN_VALUE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	750 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	751 case IMPORT_STAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	752 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	753 case YIELD_VALUE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	754 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	755
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	756 case POP_BLOCK:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	757 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	758 case END_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	759 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	760 case BUILD_CLASS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	761 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	762
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	763 case STORE_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	764 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	765 case DELETE_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	766 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	767 case UNPACK_SEQUENCE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	768 return oparg-1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	769 case FOR_ITER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	770 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	771
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	772 case STORE_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	773 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	774 case DELETE_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	775 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	776 case STORE_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	777 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	778 case DELETE_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	779 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	780 case DUP_TOPX:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	781 return oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	782 case LOAD_CONST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	783 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	784 case LOAD_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	785 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	786 case BUILD_TUPLE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	787 case BUILD_LIST:
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39676 diff changeset	788 case BUILD_SET:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	789 return 1-oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	790 case BUILD_MAP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	791 return 1;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40788 diff changeset	792 case MAKE_BYTES:
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40788 diff changeset	793 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	794 case LOAD_ATTR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	795 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	796 case COMPARE_OP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	797 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	798 case IMPORT_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	799 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	800 case IMPORT_FROM:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	801 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	802
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	803 case JUMP_FORWARD:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	804 case JUMP_IF_FALSE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	805 case JUMP_IF_TRUE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	806 case JUMP_ABSOLUTE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	807 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	808
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	809 case LOAD_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	810 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	811
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	812 case CONTINUE_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	813 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	814 case SETUP_LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	815 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	816 case SETUP_EXCEPT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	817 case SETUP_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	818 return 3; /* actually pushed by an exception */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	819
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	820 case LOAD_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	821 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	822 case STORE_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	823 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	824 case DELETE_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	825 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	826
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	827 case RAISE_VARARGS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	828 return -oparg;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	829 #define NARGS(o) (((o) % 256) + 2*(((o) / 256) % 256))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	830 case CALL_FUNCTION:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	831 return -NARGS(oparg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	832 case CALL_FUNCTION_VAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	833 case CALL_FUNCTION_KW:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	834 return -NARGS(oparg)-1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	835 case CALL_FUNCTION_VAR_KW:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	836 return -NARGS(oparg)-2;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	837 case MAKE_FUNCTION:
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	838 return -NARGS(oparg) - ((oparg >> 16) & 0xffff);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	839 #undef NARGS
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	840 case BUILD_SLICE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	841 if (oparg == 3)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	842 return -2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	843 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	844 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	845
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	846 case MAKE_CLOSURE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	847 return -oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	848 case LOAD_CLOSURE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	849 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	850 case LOAD_DEREF:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	851 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	852 case STORE_DEREF:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	853 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	854 default:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	855 fprintf(stderr, "opcode = %d\n", opcode);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	856 Py_FatalError("opcode_stack_effect()");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	857
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	858 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	859 return 0; /* not reachable */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	860 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	861
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	862 /* Add an opcode with no argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	863 Returns 0 on failure, 1 on success.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	864 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	865
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	866 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	867 compiler_addop(struct compiler *c, int opcode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	868 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	869 basicblock *b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	870 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	871 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	872 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	873 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	874 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	875 b = c->u->u_curblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	876 i = &b->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	877 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	878 i->i_hasarg = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	879 if (opcode == RETURN_VALUE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	880 b->b_return = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	881 compiler_set_lineno(c, off);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	882 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	883 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	884
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	885 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	886 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	887 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	888 PyObject t, v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	889 Py_ssize_t arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	890
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	891 /* 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	892 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	893 if (t == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	894 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	895
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	896 v = PyDict_GetItem(dict, t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	897 if (!v) {
39637 472ca7006f70 Check for exceptions set by PyDict_GetItem(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 39610 diff changeset	898 if (PyErr_Occurred())
472ca7006f70 Check for exceptions set by PyDict_GetItem(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 39610 diff changeset	899 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	900 arg = PyDict_Size(dict);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	901 v = PyInt_FromLong(arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	902 if (!v) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	903 Py_DECREF(t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	904 return -1;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	905 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	906 if (PyDict_SetItem(dict, t, v) < 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	907 Py_DECREF(t);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	908 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	909 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	910 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	911 Py_DECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	912 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	913 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	914 arg = PyInt_AsLong(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	915 Py_DECREF(t);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	916 return arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	917 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	918
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	919 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	920 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	921 PyObject *o)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	922 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	923 int arg = compiler_add_o(c, dict, o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	924 if (arg < 0)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	925 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	926 return compiler_addop_i(c, opcode, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	927 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	928
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	929 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	930 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	931 PyObject *o)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	932 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	933 int arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	934 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	935 if (!mangled)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	936 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	937 arg = compiler_add_o(c, dict, mangled);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	938 Py_DECREF(mangled);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	939 if (arg < 0)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	940 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	941 return compiler_addop_i(c, opcode, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	942 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	943
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	944 /* Add an opcode with an integer argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	945 Returns 0 on failure, 1 on success.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	946 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	947
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	948 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	949 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	950 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	951 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	952 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	953 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	954 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	955 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	956 i = &c->u->u_curblock->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	957 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	958 i->i_oparg = oparg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	959 i->i_hasarg = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	960 compiler_set_lineno(c, off);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	961 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	962 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	963
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	964 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	965 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	966 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	967 struct instr *i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	968 int off;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	969
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	970 assert(b != NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	971 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	972 if (off < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	973 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	974 i = &c->u->u_curblock->b_instr[off];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	975 i->i_opcode = opcode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	976 i->i_target = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	977 i->i_hasarg = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	978 if (absolute)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	979 i->i_jabs = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	980 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	981 i->i_jrel = 1;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	982 compiler_set_lineno(c, off);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	983 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	984 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	985
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	986 /* 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	987 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	988 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	989 from the current block to the new block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	990 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	991
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	992 /* The returns inside these macros make it impossible to decref objects
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	993 created in the local function. Local objects should use the arena.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	994 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	995
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	996
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	997 #define NEW_BLOCK(C) { \
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	998 if (compiler_use_new_block((C)) == NULL) \
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	999 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1000 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1001
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1002 #define NEXT_BLOCK(C) { \
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1003 if (compiler_next_block((C)) == NULL) \
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1004 return 0; \
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1007 #define ADDOP(C, OP) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1008 if (!compiler_addop((C), (OP))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1009 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1010 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1011
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1012 #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	1013 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	1014 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	1015 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1016 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1017 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1018
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1019 #define ADDOP_O(C, OP, O, TYPE) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1020 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	1021 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1022 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1023
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1024 #define ADDOP_NAME(C, OP, O, TYPE) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1025 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	1026 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1027 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1028
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1029 #define ADDOP_I(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1030 if (!compiler_addop_i((C), (OP), (O))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1031 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1032 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1033
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1034 #define ADDOP_JABS(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1035 if (!compiler_addop_j((C), (OP), (O), 1)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1036 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1037 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1038
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1039 #define ADDOP_JREL(C, OP, O) { \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1040 if (!compiler_addop_j((C), (OP), (O), 0)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1041 return 0; \
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 /* 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	1045 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	1046 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1047
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1048 #define VISIT(C, TYPE, V) {\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1049 if (!compiler_visit_ ## TYPE((C), (V))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1050 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1051 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1052
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1053 #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	1054 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	1055 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	1056 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1057 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1058 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1059
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1060 #define VISIT_SLICE(C, V, CTX) {\
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1061 if (!compiler_visit_slice((C), (V), (CTX))) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1062 return 0; \
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 #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	1066 int _i; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1067 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	1068 for (_i = 0; _i < asdl_seq_LEN(seq); _i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1069 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, _i); \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1070 if (!compiler_visit_ ## TYPE((C), elt)) \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1071 return 0; \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1072 } \
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1073 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1074
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1075 #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	1076 int _i; \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1077 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	1078 for (_i = 0; _i < asdl_seq_LEN(seq); _i++) { \
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1079 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, _i); \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1080 if (!compiler_visit_ ## TYPE((C), elt)) { \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1081 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	1082 return 0; \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1083 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1084 } \
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1085 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1086
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1087 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1088 compiler_isdocstring(stmt_ty s)
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 if (s->kind != Expr_kind)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1091 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1092 return s->v.Expr.value->kind == Str_kind;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1095 /* 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	1096
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1097 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1098 compiler_body(struct compiler c, asdl_seq stmts)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1099 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1100 int i = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1101 stmt_ty st;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1102
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1103 if (!asdl_seq_LEN(stmts))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1104 return 1;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1105 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	1106 if (compiler_isdocstring(st)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1107 i = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1108 VISIT(c, expr, st->v.Expr.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1109 if (!compiler_nameop(c, __doc__, Store))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1110 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1111 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1112 for (; i < asdl_seq_LEN(stmts); i++)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1113 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	1114 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1115 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1116
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1117 static PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1118 compiler_mod(struct compiler *c, mod_ty mod)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1119 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1120 PyCodeObject *co;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1121 int addNone = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1122 static PyObject *module;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1123 if (!module) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1124 module = PyString_FromString("<module>");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1125 if (!module)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1126 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1127 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1128 /* Use 0 for firstlineno initially, will fixup in assemble(). */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1129 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	1130 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1131 switch (mod->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1132 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	1133 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	1134 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1135 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	1136 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1137 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1138 case Interactive_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1139 c->c_interactive = 1;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1140 VISIT_SEQ_IN_SCOPE(c, stmt,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1141 mod->v.Interactive.body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1142 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1143 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	1144 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	1145 addNone = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1146 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1147 case Suite_kind:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1148 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1149 "suite should not be possible");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1150 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1151 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1152 PyErr_Format(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1153 "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	1154 mod->kind);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1155 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1156 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1157 co = assemble(c, addNone);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1158 compiler_exit_scope(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1159 return co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1160 }
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 /* 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	1163 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	1164 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	1165 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1166
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1167 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1168 get_ref_type(struct compiler c, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1169 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1170 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	1171 if (scope == 0) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1172 char buf[350];
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1173 PyOS_snprintf(buf, sizeof(buf),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1174 "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	1175 "symbols: %s\nlocals: %s\nglobals: %s\n",
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1176 PyString_AS_STRING(name),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1177 PyString_AS_STRING(c->u->u_name),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1178 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	1179 c->c_filename,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1180 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	1181 PyObject_REPR(c->u->u_varnames),
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1182 PyObject_REPR(c->u->u_names)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1183 );
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1184 Py_FatalError(buf);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1185 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1186
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1187 return scope;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1188 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1189
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1190 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1191 compiler_lookup_arg(PyObject dict, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1192 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1193 PyObject k, v;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1194 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	1195 if (k == NULL)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1196 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1197 v = PyDict_GetItem(dict, k);
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 35895 diff changeset	1198 Py_DECREF(k);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1199 if (v == NULL)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1200 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1201 return PyInt_AS_LONG(v);
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 int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1205 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	1206 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1207 int i, free = PyCode_GetNumFree(co);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1208 if (free == 0) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1209 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	1210 ADDOP_I(c, MAKE_FUNCTION, args);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1211 return 1;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1212 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1213 for (i = 0; i < free; ++i) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1214 /* Bypass com_addop_varname because it will generate
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1215 LOAD_DEREF but LOAD_CLOSURE is needed.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1216 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1217 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	1218 int arg, reftype;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1219
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1220 /* 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	1221 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	1222 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	1223 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	1224 well as by the normal name loookup logic.
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 reftype = get_ref_type(c, name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1227 if (reftype == CELL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1228 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	1229 else /* (reftype == FREE) */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1230 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	1231 if (arg == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1232 printf("lookup %s in %s %d %d\n"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1233 "freevars of %s: %s\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1234 PyObject_REPR(name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1235 PyString_AS_STRING(c->u->u_name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1236 reftype, arg,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1237 PyString_AS_STRING(co->co_name),
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1238 PyObject_REPR(co->co_freevars));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1239 Py_FatalError("compiler_make_closure()");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1240 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1241 ADDOP_I(c, LOAD_CLOSURE, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1242 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1243 ADDOP_I(c, BUILD_TUPLE, free);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1244 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	1245 ADDOP_I(c, MAKE_CLOSURE, args);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1246 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1247 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1248
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1249 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1250 compiler_decorators(struct compiler c, asdl_seq decos)
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 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1253
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1254 if (!decos)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1255 return 1;
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 for (i = 0; i < asdl_seq_LEN(decos); i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1258 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	1259 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1260 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1261 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1262
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1263 static int
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1264 compiler_unpack_nested(struct compiler c, asdl_seq args) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1265 int i, len;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1266 len = asdl_seq_LEN(args);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1267 ADDOP_I(c, UNPACK_SEQUENCE, len);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1268 for (i = 0; i < len; i++) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1269 arg_ty elt = (arg_ty)asdl_seq_GET(args, i);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1270 switch (elt->kind) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1271 case SimpleArg_kind:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1272 if (!compiler_nameop(c, elt->v.SimpleArg.arg, Store))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1273 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1274 break;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1275 case NestedArgs_kind:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1276 if (!compiler_unpack_nested(c, elt->v.NestedArgs.args))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1277 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1278 break;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1279 default:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1280 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1281 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1282 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1283 return 1;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1284 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1285
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1286 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1287 compiler_arguments(struct compiler *c, arguments_ty args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1288 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1289 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1290 int n = asdl_seq_LEN(args->args);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1291
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1292 for (i = 0; i < n; i++) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1293 arg_ty arg = (arg_ty)asdl_seq_GET(args->args, i);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1294 if (arg->kind == NestedArgs_kind) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1295 PyObject *id = PyString_FromFormat(".%d", i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1296 if (id == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1297 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1298 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1299 if (!compiler_nameop(c, id, Load)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1300 Py_DECREF(id);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1301 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1302 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1303 Py_DECREF(id);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1304 if (!compiler_unpack_nested(c, arg->v.NestedArgs.args))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1305 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1306 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1307 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1308 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1309 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1310
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1311 static int
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1312 compiler_visit_kwonlydefaults(struct compiler c, asdl_seq kwonlyargs,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1313 asdl_seq *kw_defaults)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1314 {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1315 int i, default_count = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1316 for (i = 0; i < asdl_seq_LEN(kwonlyargs); i++) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1317 arg_ty arg = asdl_seq_GET(kwonlyargs, i);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1318 expr_ty default_ = asdl_seq_GET(kw_defaults, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1319 if (default_) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1320 ADDOP_O(c, LOAD_CONST, arg->v.SimpleArg.arg, consts);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1321 if (!compiler_visit_expr(c, default_)) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1322 return -1;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1323 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1324 default_count++;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1325 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1326 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1327 return default_count;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1328 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1329
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1330 static int
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1331 compiler_visit_argannotation(struct compiler *c, identifier id,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1332 expr_ty annotation, PyObject *names)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1333 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1334 if (annotation) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1335 VISIT(c, expr, annotation);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1336 if (PyList_Append(names, id))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1337 return -1;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1338 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1339 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1340 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1341
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1342 static int
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1343 compiler_visit_argannotations(struct compiler c, asdl_seq args,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1344 PyObject *names)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1345 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1346 int i, error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1347 for (i = 0; i < asdl_seq_LEN(args); i++) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1348 arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1349 if (arg->kind == NestedArgs_kind)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1350 error = compiler_visit_argannotations(
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1351 c,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1352 arg->v.NestedArgs.args,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1353 names);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1354 else
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1355 error = compiler_visit_argannotation(
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1356 c,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1357 arg->v.SimpleArg.arg,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1358 arg->v.SimpleArg.annotation,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1359 names);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1360 if (error)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1361 return error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1362 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1363 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1364 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1365
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1366 static int
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1367 compiler_visit_annotations(struct compiler *c, arguments_ty args,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1368 expr_ty returns)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1369 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1370 /* push arg annotations and a list of the argument names. return the #
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1371 of items pushed. this is out-of-order wrt the source code. */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1372 static identifier return_str;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1373 PyObject *names;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1374 int len;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1375 names = PyList_New(0);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1376 if (!names)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1377 return -1;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1378
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1379 if (compiler_visit_argannotations(c, args->args, names))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1380 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1381 if (args->varargannotation &&
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1382 compiler_visit_argannotation(c, args->vararg,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1383 args->varargannotation, names))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1384 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1385 if (compiler_visit_argannotations(c, args->kwonlyargs, names))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1386 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1387 if (args->kwargannotation &&
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1388 compiler_visit_argannotation(c, args->kwarg,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1389 args->kwargannotation, names))
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1390 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1391
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1392 if (!return_str) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1393 return_str = PyString_InternFromString("return");
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1394 if (!return_str)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1395 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1396 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1397 if (compiler_visit_argannotation(c, return_str, returns, names)) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1398 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1399 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1400
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1401 len = PyList_GET_SIZE(names);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1402 if (len) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1403 /* convert names to a tuple and place on stack */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1404 PyObject *elt;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1405 int i;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1406 PyObject *s = PyTuple_New(len);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1407 if (!s)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1408 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1409 for (i = 0; i < len; i++) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1410 elt = PyList_GET_ITEM(names, i);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1411 Py_INCREF(elt);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1412 PyTuple_SET_ITEM(s, i, elt);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1413 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1414 ADDOP_O(c, LOAD_CONST, s, consts);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1415 Py_DECREF(s);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1416 len++; /* include the just-pushed tuple */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1417 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1418 Py_DECREF(names);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1419 return len;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1420
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1421 error:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1422 Py_DECREF(names);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1423 return -1;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1424 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1425
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1426 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1427 compiler_function(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1428 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1429 PyCodeObject *co;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1430 PyObject *first_const = Py_None;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1431 arguments_ty args = s->v.FunctionDef.args;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1432 expr_ty returns = s->v.FunctionDef.returns;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1433 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	1434 stmt_ty st;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1435 int i, n, docstring, kw_default_count = 0, arglength;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1436 int num_annotations;
35742 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 assert(s->kind == FunctionDef_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1439
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1440 if (!compiler_decorators(c, decos))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1441 return 0;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1442 if (args->kwonlyargs) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1443 int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1444 args->kw_defaults);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1445 if (res < 0)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1446 return 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1447 kw_default_count = res;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1448 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1449 if (args->defaults)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1450 VISIT_SEQ(c, expr, args->defaults);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1451 num_annotations = compiler_visit_annotations(c, args, returns);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1452
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1453 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	1454 s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1455 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1456
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1457 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	1458 docstring = compiler_isdocstring(st);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1459 if (docstring)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1460 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	1461 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	1462 compiler_exit_scope(c);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1463 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	1464 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1465
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1466 /* unpack nested arguments */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1467 compiler_arguments(c, args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1468
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1469 c->u->u_argcount = asdl_seq_LEN(args->args);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1470 c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1471 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	1472 /* 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	1473 for (i = docstring; i < n; i++) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1474 st = (stmt_ty)asdl_seq_GET(s->v.FunctionDef.body, i);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1475 VISIT_IN_SCOPE(c, stmt, st);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1476 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1477 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	1478 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1479 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1480 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1481
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1482 arglength = asdl_seq_LEN(args->defaults);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1483 arglength \|= kw_default_count << 8;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1484 arglength \|= num_annotations << 16;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1485 compiler_make_closure(c, co, arglength);
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1486 Py_DECREF(co);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1487
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1488 /* decorators */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1489 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	1490 ADDOP_I(c, CALL_FUNCTION, 1);
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1493 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	1494 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1495
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1496 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1497 compiler_class(struct compiler *c, stmt_ty s)
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 int n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1500 PyCodeObject *co;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1501 PyObject *str;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1502 /* 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	1503 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	1504 /* 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	1505 n = asdl_seq_LEN(s->v.ClassDef.bases);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1506 if (n > 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1507 VISIT_SEQ(c, expr, s->v.ClassDef.bases);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1508 ADDOP_I(c, BUILD_TUPLE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1509 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	1510 s->lineno))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1511 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1512 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	1513 Py_INCREF(c->u->u_private);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1514 str = PyString_InternFromString("__name__");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1515 if (!str \|\| !compiler_nameop(c, str, Load)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1516 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	1517 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1518 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1519 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1520
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1521 Py_DECREF(str);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1522 str = PyString_InternFromString("__module__");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1523 if (!str \|\| !compiler_nameop(c, str, Store)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1524 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	1525 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1526 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1527 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1528 Py_DECREF(str);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1529
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	1530 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	1531 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1532 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	1533 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1534
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1535 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	1536 ADDOP_IN_SCOPE(c, RETURN_VALUE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1537 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	1538 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1539 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1540 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1541
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1542 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	1543 Py_DECREF(co);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1544
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1545 ADDOP_I(c, CALL_FUNCTION, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1546 ADDOP(c, BUILD_CLASS);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1547 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	1548 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1549 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1550 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1551
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1552 static int
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1553 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	1554 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1555 basicblock end, next;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1556
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1557 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	1558 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	1559 if (end == NULL)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1560 return 0;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1561 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	1562 if (next == NULL)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1563 return 0;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1564 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	1565 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	1566 ADDOP(c, POP_TOP);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1567 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	1568 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	1569 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	1570 ADDOP(c, POP_TOP);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1571 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	1572 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	1573 return 1;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1574 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1575
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1576 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1577 compiler_lambda(struct compiler *c, expr_ty e)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1578 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1579 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	1580 static identifier name;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1581 int kw_default_count = 0, arglength;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1582 arguments_ty args = e->v.Lambda.args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1583 assert(e->kind == Lambda_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1584
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	1585 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	1586 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	1587 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	1588 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	1589 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1590
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1591 if (args->kwonlyargs) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1592 int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1593 args->kw_defaults);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1594 if (res < 0) return 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1595 kw_default_count = res;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1596 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1597 if (args->defaults)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1598 VISIT_SEQ(c, expr, args->defaults);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1599 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	1600 return 0;
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1601
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1602 /* unpack nested arguments */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1603 compiler_arguments(c, args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1604
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1605 c->u->u_argcount = asdl_seq_LEN(args->args);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1606 c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1607 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	1608 ADDOP_IN_SCOPE(c, RETURN_VALUE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1609 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	1610 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1611 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1612 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1613
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1614 arglength = asdl_seq_LEN(args->defaults);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1615 arglength \|= kw_default_count << 8;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1616 compiler_make_closure(c, co, arglength);
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	1617 Py_DECREF(co);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1618
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1619 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1622 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1623 compiler_if(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1624 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1625 basicblock end, next;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1626 int constant;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1627 assert(s->kind == If_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1628 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1629 if (end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1630 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1631 next = compiler_new_block(c);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1632 if (next == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1633 return 0;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1634
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1635 constant = expr_constant(s->v.If.test);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1636 /* constant = 0: "if 0"
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1637 * constant = 1: "if 1", "if 2", ...
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1638 * constant = -1: rest */
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1639 if (constant == 0) {
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1640 if (s->v.If.orelse)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1641 VISIT_SEQ(c, stmt, s->v.If.orelse);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1642 } else if (constant == 1) {
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1643 VISIT_SEQ(c, stmt, s->v.If.body);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1644 } else {
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1645 VISIT(c, expr, s->v.If.test);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1646 ADDOP_JREL(c, JUMP_IF_FALSE, next);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1647 ADDOP(c, POP_TOP);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1648 VISIT_SEQ(c, stmt, s->v.If.body);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1649 ADDOP_JREL(c, JUMP_FORWARD, end);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1650 compiler_use_next_block(c, next);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1651 ADDOP(c, POP_TOP);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1652 if (s->v.If.orelse)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1653 VISIT_SEQ(c, stmt, s->v.If.orelse);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1654 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1655 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1656 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1657 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1658
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1659 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1660 compiler_for(struct compiler *c, stmt_ty s)
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 basicblock start, cleanup, *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1663
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1664 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1665 cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1666 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1667 if (start == NULL \|\| end == NULL \|\| cleanup == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1668 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1669 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1670 if (!compiler_push_fblock(c, LOOP, start))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1671 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1672 VISIT(c, expr, s->v.For.iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1673 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1674 compiler_use_next_block(c, start);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1675 /* XXX(nnorwitz): is there a better way to handle this?
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1676 for loops are special, we want to be able to trace them
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1677 each time around, so we need to set an extra line number. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1678 c->u->u_lineno_set = false;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1679 ADDOP_JREL(c, FOR_ITER, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1680 VISIT(c, expr, s->v.For.target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1681 VISIT_SEQ(c, stmt, s->v.For.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1682 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1683 compiler_use_next_block(c, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1684 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1685 compiler_pop_fblock(c, LOOP, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1686 VISIT_SEQ(c, stmt, s->v.For.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1687 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1688 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1689 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1690
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1691 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1692 compiler_while(struct compiler *c, stmt_ty s)
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 basicblock loop, orelse, end, anchor = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1695 int constant = expr_constant(s->v.While.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1696
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1697 if (constant == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1698 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1699 loop = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1700 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1701 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1702 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1703 if (anchor == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1704 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1705 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1706 if (loop == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1707 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1708 if (s->v.While.orelse) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1709 orelse = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1710 if (orelse == NULL)
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 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1714 orelse = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1715
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1716 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1717 compiler_use_next_block(c, loop);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1718 if (!compiler_push_fblock(c, LOOP, loop))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1719 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1720 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1721 VISIT(c, expr, s->v.While.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1722 ADDOP_JREL(c, JUMP_IF_FALSE, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1723 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1724 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1725 VISIT_SEQ(c, stmt, s->v.While.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1726 ADDOP_JABS(c, JUMP_ABSOLUTE, loop);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1727
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1728 /* 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	1729 if there is no else clause ?
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1730 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1731
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1732 if (constant == -1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1733 compiler_use_next_block(c, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1734 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1735 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1736 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1737 compiler_pop_fblock(c, LOOP, loop);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1738 if (orelse != NULL) /* what if orelse is just pass? */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1739 VISIT_SEQ(c, stmt, s->v.While.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1740 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1741
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1742 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1743 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1744
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1745 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1746 compiler_continue(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1747 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1748 static const char LOOP_ERROR_MSG[] = "'continue' not properly in loop";
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1749 static const char IN_FINALLY_ERROR_MSG[] =
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1750 "'continue' not supported inside 'finally' clause";
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1751 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1752
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1753 if (!c->u->u_nfblocks)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1754 return compiler_error(c, LOOP_ERROR_MSG);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1755 i = c->u->u_nfblocks - 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1756 switch (c->u->u_fblock[i].fb_type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1757 case LOOP:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1758 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	1759 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1760 case EXCEPT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1761 case FINALLY_TRY:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1762 while (--i >= 0 && c->u->u_fblock[i].fb_type != LOOP) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1763 /* Prevent continue anywhere under a finally
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1764 even if hidden in a sub-try or except. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1765 if (c->u->u_fblock[i].fb_type == FINALLY_END)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1766 return compiler_error(c, IN_FINALLY_ERROR_MSG);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1767 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1768 if (i == -1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1769 return compiler_error(c, LOOP_ERROR_MSG);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1770 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	1771 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1772 case FINALLY_END:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1773 return compiler_error(c, IN_FINALLY_ERROR_MSG);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1774 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1775
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1776 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1777 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1778
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1779 /* 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	1780
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1781 SETUP_FINALLY L
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1782 <code for body>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1783 POP_BLOCK
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1784 LOAD_CONST <None>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1785 L: <code for finalbody>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1786 END_FINALLY
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1787
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1788 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	1789 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	1790 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	1791 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	1792
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1793 SETUP_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1794 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	1795 onto the block stack.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1796 POP_BLOCK:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1797 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	1798 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	1799 block stack. (The label is ignored.)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1800 END_FINALLY:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1801 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	1802 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	1803 entries popped depends on the (pseudo) exception type.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1804
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1805 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	1806 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	1807 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	1808 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	1809 stack.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1810 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1811
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1812 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1813 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	1814 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1815 basicblock body, end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1816 body = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1817 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1818 if (body == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1819 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1820
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1821 ADDOP_JREL(c, SETUP_FINALLY, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1822 compiler_use_next_block(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1823 if (!compiler_push_fblock(c, FINALLY_TRY, body))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1824 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1825 VISIT_SEQ(c, stmt, s->v.TryFinally.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1826 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1827 compiler_pop_fblock(c, FINALLY_TRY, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1828
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1829 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1830 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1831 if (!compiler_push_fblock(c, FINALLY_END, end))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1832 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1833 VISIT_SEQ(c, stmt, s->v.TryFinally.finalbody);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1834 ADDOP(c, END_FINALLY);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1835 compiler_pop_fblock(c, FINALLY_END, end);
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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1838 }
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 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1841 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	1842 (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	1843 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	1844 associated value, and 'exc' the exception.)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1845
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1846 Value stack Label Instruction Argument
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1847 [] SETUP_EXCEPT L1
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1848 [] <code for S>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1849 [] POP_BLOCK
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1850 [] JUMP_FORWARD L0
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1851
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1852 [tb, val, exc] L1: DUP )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1853 [tb, val, exc, exc] <evaluate E1> )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1854 [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	1855 [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	1856 [tb, val, exc, 1] POP )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1857 [tb, val, exc] POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1858 [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	1859 [tb] POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1860 [] <code for S1>
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1861 JUMP_FORWARD L0
35742 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 [tb, val, exc, 0] L2: POP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1864 [tb, val, exc] DUP
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1865 .............................etc.......................
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1866
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1867 [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	1868 [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	1869
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1870 [] L0: <next statement>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1871
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1872 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	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_try_except(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1876 {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	1877 basicblock body, orelse, except, end;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1878 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1879
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1880 body = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1881 except = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1882 orelse = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1883 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1884 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	1885 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1886 ADDOP_JREL(c, SETUP_EXCEPT, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1887 compiler_use_next_block(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1888 if (!compiler_push_fblock(c, EXCEPT, body))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1889 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1890 VISIT_SEQ(c, stmt, s->v.TryExcept.body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1891 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1892 compiler_pop_fblock(c, EXCEPT, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1893 ADDOP_JREL(c, JUMP_FORWARD, orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1894 n = asdl_seq_LEN(s->v.TryExcept.handlers);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1895 compiler_use_next_block(c, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1896 for (i = 0; i < n; i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1897 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	1898 s->v.TryExcept.handlers, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1899 if (!handler->type && i < n-1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1900 return compiler_error(c, "default 'except:' must be last");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1901 c->u->u_lineno_set = false;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	1902 c->u->u_lineno = handler->lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1903 except = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1904 if (except == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1905 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1906 if (handler->type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1907 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1908 VISIT(c, expr, handler->type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1909 ADDOP_I(c, COMPARE_OP, PyCmp_EXC_MATCH);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1910 ADDOP_JREL(c, JUMP_IF_FALSE, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1911 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1912 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1913 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1914 if (handler->name) {
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1915 basicblock cleanup_end, cleanup_body;
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1916
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1917 cleanup_end = compiler_new_block(c);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1918 cleanup_body = compiler_new_block(c);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1919 if(!(cleanup_end \|\| cleanup_body))
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1920 return 0;
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1921
40588 4bab65fcca8e Some more changes related to the new except syntax and semantics, Guido van Rossum <guido@python.org> parents: 40587 diff changeset	1922 compiler_nameop(c, handler->name, Store);
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1923 ADDOP(c, POP_TOP);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1924
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1925 /*
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1926 try:
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1927 # body
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1928 except type as name:
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1929 try:
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1930 # body
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1931 finally:
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1932 name = None
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1933 del name
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1934 */
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1935
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1936 /* second try: */
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1937 ADDOP_JREL(c, SETUP_FINALLY, cleanup_end);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1938 compiler_use_next_block(c, cleanup_body);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1939 if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1940 return 0;
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1941
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1942 /* second # body */
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1943 VISIT_SEQ(c, stmt, handler->body);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1944 ADDOP(c, POP_BLOCK);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1945 compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1946
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1947 /* finally: */
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1948 ADDOP_O(c, LOAD_CONST, Py_None, consts);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1949 compiler_use_next_block(c, cleanup_end);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1950 if (!compiler_push_fblock(c, FINALLY_END, cleanup_end))
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1951 return 0;
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1952
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1953 /* name = None */
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1954 ADDOP_O(c, LOAD_CONST, Py_None, consts);
40588 4bab65fcca8e Some more changes related to the new except syntax and semantics, Guido van Rossum <guido@python.org> parents: 40587 diff changeset	1955 compiler_nameop(c, handler->name, Store);
4bab65fcca8e Some more changes related to the new except syntax and semantics, Guido van Rossum <guido@python.org> parents: 40587 diff changeset	1956
4bab65fcca8e Some more changes related to the new except syntax and semantics, Guido van Rossum <guido@python.org> parents: 40587 diff changeset	1957 /* del name */
4bab65fcca8e Some more changes related to the new except syntax and semantics, Guido van Rossum <guido@python.org> parents: 40587 diff changeset	1958 compiler_nameop(c, handler->name, Del);
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1959
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1960 ADDOP(c, END_FINALLY);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1961 compiler_pop_fblock(c, FINALLY_END, cleanup_end);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1962 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1963 else {
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1964 ADDOP(c, POP_TOP);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1965 ADDOP(c, POP_TOP);
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1966 VISIT_SEQ(c, stmt, handler->body);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1967 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1968 ADDOP_JREL(c, JUMP_FORWARD, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1969 compiler_use_next_block(c, except);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1970 if (handler->type)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1971 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1972 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1973 ADDOP(c, END_FINALLY);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1974 compiler_use_next_block(c, orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1975 VISIT_SEQ(c, stmt, s->v.TryExcept.orelse);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1976 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1977 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1978 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1979
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1980 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1981 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	1982 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1983 /* 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	1984 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	1985
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1986 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	1987 LOAD_ATTR for each name.
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 const char *src = PyString_AS_STRING(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1990 const char *dot = strchr(src, '.');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1991 if (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1992 /* 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	1993 src = dot + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1994 while (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1995 /* 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	1996 PyObject *attr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1997 dot = strchr(src, '.');
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35742 diff changeset	1998 attr = PyString_FromStringAndSize(src,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1999 dot ? dot - src : strlen(src));
35895 fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2000 if (!attr)
fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2001 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2002 ADDOP_O(c, LOAD_ATTR, attr, names);
35895 fe4c627b2096 Fix a few more memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35893 diff changeset	2003 Py_DECREF(attr);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2004 src = dot + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2005 }
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 return compiler_nameop(c, asname, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2008 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2011 compiler_import(struct compiler *c, stmt_ty s)
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 /* 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	2014 string. This is convenient for all cases except
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2015 import a.b.c as d
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2016 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	2017 module names.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2018 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	2019 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2020 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	2021
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2022 for (i = 0; i < n; i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2023 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	2024 int r;
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2025 PyObject *level;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2026
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36965 diff changeset	2027 level = PyInt_FromLong(0);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2028 if (level == NULL)
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2029 return 0;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2030
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2031 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	2032 Py_DECREF(level);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2033 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2034 ADDOP_NAME(c, IMPORT_NAME, alias->name, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2035
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2036 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	2037 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	2038 if (!r)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2039 return r;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2040 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2041 else {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2042 identifier tmp = alias->name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2043 const char *base = PyString_AS_STRING(alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2044 char *dot = strchr(base, '.');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2045 if (dot)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2046 tmp = PyString_FromStringAndSize(base,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2047 dot - base);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2048 r = compiler_nameop(c, tmp, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2049 if (dot) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2050 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2051 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2052 if (!r)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2053 return r;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2054 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2055 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2056 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2057 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2058
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2059 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2060 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	2061 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2062 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	2063
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2064 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	2065 PyObject *level;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2066
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2067 if (!names)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2068 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2069
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36965 diff changeset	2070 level = PyInt_FromLong(s->v.ImportFrom.level);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2071 if (!level) {
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2072 Py_DECREF(names);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2073 return 0;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2074 }
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2075
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2076 /* build up the names */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2077 for (i = 0; i < n; i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2078 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	2079 Py_INCREF(alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2080 PyTuple_SET_ITEM(names, i, alias->name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2081 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2082
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2083 if (s->lineno > c->c_future->ff_lineno) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2084 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	2085 "__future__")) {
36804 c552f2275782 Fix refleak if from __future__ import was not first Neal Norwitz <nnorwitz@gmail.com> parents: 36797 diff changeset	2086 Py_DECREF(level);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2087 Py_DECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2088 return compiler_error(c,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2089 "from __future__ imports must occur "
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2090 "at the beginning of the file");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2091
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2092 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2093 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2094
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36697 diff changeset	2095 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	2096 Py_DECREF(level);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2097 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	2098 Py_DECREF(names);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2099 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	2100 for (i = 0; i < n; i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2101 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	2102 identifier store_name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2103
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2104 if (i == 0 && PyString_AS_STRING(alias->name) == '') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2105 assert(n == 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2106 ADDOP(c, IMPORT_STAR);
35993 a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2107 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2108 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2109
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2110 ADDOP_NAME(c, IMPORT_FROM, alias->name, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2111 store_name = alias->name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2112 if (alias->asname)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2113 store_name = alias->asname;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2114
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2115 if (!compiler_nameop(c, store_name, Store)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2116 Py_DECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2117 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2118 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2119 }
35993 a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2120 /* remove imported module */
a29c89b4e8c6 Simplify logic for handling import * Neal Norwitz <nnorwitz@gmail.com> parents: 35939 diff changeset	2121 ADDOP(c, POP_TOP);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2122 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2123 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2124
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2125 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2126 compiler_assert(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2127 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2128 static PyObject *assertion_error = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2129 basicblock *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2130
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2131 if (Py_OptimizeFlag)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2132 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2133 if (assertion_error == NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2134 assertion_error = PyString_FromString("AssertionError");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2135 if (assertion_error == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2136 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2137 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2138 VISIT(c, expr, s->v.Assert.test);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2139 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2140 if (end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2141 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2142 ADDOP_JREL(c, JUMP_IF_TRUE, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2143 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2144 ADDOP_O(c, LOAD_GLOBAL, assertion_error, names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2145 if (s->v.Assert.msg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2146 VISIT(c, expr, s->v.Assert.msg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2147 ADDOP_I(c, RAISE_VARARGS, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2148 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2149 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2150 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	2151 }
36081 19d96c2d7df5 Fix Armin's bug 1333982. He found it, he didn't created it :-) Neal Norwitz <nnorwitz@gmail.com> parents: 36079 diff changeset	2152 compiler_use_next_block(c, end);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2153 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2154 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2157 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2158 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	2159 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2160 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2161
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2162 /* 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	2163 c->u->u_lineno = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2164 c->u->u_lineno_set = false;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2165
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2166 switch (s->kind) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2167 case FunctionDef_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2168 return compiler_function(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2169 case ClassDef_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2170 return compiler_class(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2171 case Return_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2172 if (c->u->u_ste->ste_type != FunctionBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2173 return compiler_error(c, "'return' outside function");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2174 if (s->v.Return.value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2175 VISIT(c, expr, s->v.Return.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2176 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2177 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2178 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2179 ADDOP(c, RETURN_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2180 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2181 case Delete_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2182 VISIT_SEQ(c, expr, s->v.Delete.targets)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2183 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2184 case Assign_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2185 n = asdl_seq_LEN(s->v.Assign.targets);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2186 VISIT(c, expr, s->v.Assign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2187 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2188 if (i < n - 1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2189 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2190 VISIT(c, expr,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2191 (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	2192 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2193 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2194 case AugAssign_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2195 return compiler_augassign(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2196 case For_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2197 return compiler_for(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2198 case While_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2199 return compiler_while(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2200 case If_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2201 return compiler_if(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2202 case Raise_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2203 n = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2204 if (s->v.Raise.type) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2205 VISIT(c, expr, s->v.Raise.type);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2206 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2207 if (s->v.Raise.inst) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2208 VISIT(c, expr, s->v.Raise.inst);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2209 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2210 if (s->v.Raise.tback) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2211 VISIT(c, expr, s->v.Raise.tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2212 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2213 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2214 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2215 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2216 ADDOP_I(c, RAISE_VARARGS, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2217 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2218 case TryExcept_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2219 return compiler_try_except(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2220 case TryFinally_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2221 return compiler_try_finally(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2222 case Assert_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2223 return compiler_assert(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2224 case Import_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2225 return compiler_import(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2226 case ImportFrom_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2227 return compiler_from_import(c, s);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2228 case Global_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2229 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2230 case Expr_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2231 if (c->c_interactive && c->c_nestlevel <= 1) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2232 VISIT(c, expr, s->v.Expr.value);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2233 ADDOP(c, PRINT_EXPR);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2234 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2235 else if (s->v.Expr.value->kind != Str_kind &&
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2236 s->v.Expr.value->kind != Num_kind) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2237 VISIT(c, expr, s->v.Expr.value);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2238 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2239 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2240 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2241 case Pass_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2242 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2243 case Break_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2244 if (!compiler_in_loop(c))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2245 return compiler_error(c, "'break' outside loop");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2246 ADDOP(c, BREAK_LOOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2247 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2248 case Continue_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2249 return compiler_continue(c);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2250 case With_kind:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2251 return compiler_with(c, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2252 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2253 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2254 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2255
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2256 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2257 unaryop(unaryop_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2258 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2259 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2260 case Invert:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2261 return UNARY_INVERT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2262 case Not:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2263 return UNARY_NOT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2264 case UAdd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2265 return UNARY_POSITIVE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2266 case USub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2267 return UNARY_NEGATIVE;
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 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2270 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2271
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2272 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2273 binop(struct compiler *c, operator_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2274 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2275 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2276 case Add:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2277 return BINARY_ADD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2278 case Sub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2279 return BINARY_SUBTRACT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2280 case Mult:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2281 return BINARY_MULTIPLY;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2282 case Div:
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36965 diff changeset	2283 return BINARY_TRUE_DIVIDE;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2284 case Mod:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2285 return BINARY_MODULO;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2286 case Pow:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2287 return BINARY_POWER;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2288 case LShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2289 return BINARY_LSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2290 case RShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2291 return BINARY_RSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2292 case BitOr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2293 return BINARY_OR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2294 case BitXor:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2295 return BINARY_XOR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2296 case BitAnd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2297 return BINARY_AND;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2298 case FloorDiv:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2299 return BINARY_FLOOR_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2300 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2301 return 0;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2304 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2305 cmpop(cmpop_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2306 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2307 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2308 case Eq:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2309 return PyCmp_EQ;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2310 case NotEq:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2311 return PyCmp_NE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2312 case Lt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2313 return PyCmp_LT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2314 case LtE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2315 return PyCmp_LE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2316 case Gt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2317 return PyCmp_GT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2318 case GtE:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2319 return PyCmp_GE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2320 case Is:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2321 return PyCmp_IS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2322 case IsNot:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2323 return PyCmp_IS_NOT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2324 case In:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2325 return PyCmp_IN;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2326 case NotIn:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2327 return PyCmp_NOT_IN;
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 return PyCmp_BAD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2330 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2331
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2332 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2333 inplace_binop(struct compiler *c, operator_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2334 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2335 switch (op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2336 case Add:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2337 return INPLACE_ADD;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2338 case Sub:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2339 return INPLACE_SUBTRACT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2340 case Mult:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2341 return INPLACE_MULTIPLY;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2342 case Div:
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36965 diff changeset	2343 return INPLACE_TRUE_DIVIDE;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2344 case Mod:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2345 return INPLACE_MODULO;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2346 case Pow:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2347 return INPLACE_POWER;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2348 case LShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2349 return INPLACE_LSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2350 case RShift:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2351 return INPLACE_RSHIFT;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2352 case BitOr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2353 return INPLACE_OR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2354 case BitXor:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2355 return INPLACE_XOR;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2356 case BitAnd:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2357 return INPLACE_AND;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2358 case FloorDiv:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2359 return INPLACE_FLOOR_DIVIDE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2360 }
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2361 PyErr_Format(PyExc_SystemError,
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2362 "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	2363 return 0;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2366 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2367 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	2368 {
35781 31d36dd5959c Remove unnecessary local variable. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35779 diff changeset	2369 int op, scope, arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2370 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	2371
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2372 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	2373 PyObject *mangled;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2374 /* XXX AugStore isn't used anywhere! */
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 /* First check for assignment to __debug__. Param? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2377 if ((ctx == Store \|\| ctx == AugStore \|\| ctx == Del)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2378 && !strcmp(PyString_AS_STRING(name), "__debug__")) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2379 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	2380 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2381
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2382 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	2383 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	2384 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	2385
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2386 op = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2387 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	2388 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	2389 switch (scope) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2390 case FREE:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2391 dict = c->u->u_freevars;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2392 optype = OP_DEREF;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2393 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2394 case CELL:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2395 dict = c->u->u_cellvars;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2396 optype = OP_DEREF;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2397 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2398 case LOCAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2399 if (c->u->u_ste->ste_type == FunctionBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2400 optype = OP_FAST;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2401 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2402 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	2403 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	2404 !c->u->u_ste->ste_unoptimized)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2405 optype = OP_GLOBAL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2406 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2407 case GLOBAL_EXPLICIT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2408 optype = OP_GLOBAL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2409 break;
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2410 default:
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2411 /* scope can be 0 */
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2412 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2413 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2414
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2415 /* 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	2416 assert(scope \|\| PyString_AS_STRING(name)[0] == '_');
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2417
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2418 switch (optype) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2419 case OP_DEREF:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2420 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2421 case Load: op = LOAD_DEREF; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2422 case Store: op = STORE_DEREF; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2423 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2424 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2425 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2426 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2427 PyErr_Format(PyExc_SyntaxError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2428 "can not delete variable '%s' referenced "
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2429 "in nested scope",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2430 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	2431 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2432 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2433 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2434 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2435 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2436 "param invalid for deref variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2437 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2438 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2439 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2440 case OP_FAST:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2441 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2442 case Load: op = LOAD_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2443 case Store: op = STORE_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2444 case Del: op = DELETE_FAST; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2445 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2446 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2447 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2448 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2449 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2450 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2451 "param invalid for local variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2452 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2453 }
35779 19d796bd740f Fix private name mangling. The symtable also must do mangles so that Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35778 diff changeset	2454 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	2455 Py_DECREF(mangled);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2456 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2457 case OP_GLOBAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2458 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2459 case Load: op = LOAD_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2460 case Store: op = STORE_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2461 case Del: op = DELETE_GLOBAL; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2462 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2463 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2464 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2465 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2466 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2467 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2468 "param invalid for global variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2469 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2470 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2471 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2472 case OP_NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2473 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2474 case Load: op = LOAD_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2475 case Store: op = STORE_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2476 case Del: op = DELETE_NAME; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2477 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2478 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2479 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2480 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	2481 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2482 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2483 "param invalid for name variable");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2484 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2485 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2486 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2487 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2488
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2489 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	2490 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	2491 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	2492 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	2493 return 0;
35781 31d36dd5959c Remove unnecessary local variable. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35779 diff changeset	2494 return compiler_addop_i(c, op, arg);
35742 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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2498 compiler_boolop(struct compiler *c, expr_ty e)
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 basicblock *end;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2501 int jumpi, i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2502 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2503
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2504 assert(e->kind == BoolOp_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2505 if (e->v.BoolOp.op == And)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2506 jumpi = JUMP_IF_FALSE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2507 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2508 jumpi = JUMP_IF_TRUE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2509 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	2510 if (end == NULL)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2511 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2512 s = e->v.BoolOp.values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2513 n = asdl_seq_LEN(s) - 1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2514 assert(n >= 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2515 for (i = 0; i < n; ++i) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2516 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	2517 ADDOP_JREL(c, jumpi, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2518 ADDOP(c, POP_TOP)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2519 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2520 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	2521 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2522 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2523 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2524
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2525 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2526 compiler_list(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2527 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2528 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	2529 if (e->v.List.ctx == Store) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2530 ADDOP_I(c, UNPACK_SEQUENCE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2531 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2532 VISIT_SEQ(c, expr, e->v.List.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2533 if (e->v.List.ctx == Load) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2534 ADDOP_I(c, BUILD_LIST, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2535 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2536 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2537 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2538
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2539 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2540 compiler_tuple(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2541 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2542 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	2543 if (e->v.Tuple.ctx == Store) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2544 ADDOP_I(c, UNPACK_SEQUENCE, n);
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 VISIT_SEQ(c, expr, e->v.Tuple.elts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2547 if (e->v.Tuple.ctx == Load) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2548 ADDOP_I(c, BUILD_TUPLE, n);
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_compare(struct compiler *c, expr_ty e)
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;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2557 basicblock *cleanup = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2558
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2559 /* 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	2560 VISIT(c, expr, e->v.Compare.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2561 n = asdl_seq_LEN(e->v.Compare.ops);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2562 assert(n > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2563 if (n > 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2564 cleanup = compiler_new_block(c);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2565 if (cleanup == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2566 return 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2567 VISIT(c, expr,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2568 (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	2569 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2570 for (i = 1; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2571 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2572 ADDOP(c, ROT_THREE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2573 ADDOP_I(c, COMPARE_OP,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2574 cmpop((cmpop_ty)(asdl_seq_GET(
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2575 e->v.Compare.ops, i - 1))));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2576 ADDOP_JREL(c, JUMP_IF_FALSE, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2577 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2578 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2579 if (i < (n - 1))
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2580 VISIT(c, expr,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2581 (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	2582 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2583 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	2584 ADDOP_I(c, COMPARE_OP,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2585 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	2586 if (n > 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2587 basicblock *end = compiler_new_block(c);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2588 if (end == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2589 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2590 ADDOP_JREL(c, JUMP_FORWARD, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2591 compiler_use_next_block(c, cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2592 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2593 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2594 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2595 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2596 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2597 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2598
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2599 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2600 compiler_call(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2601 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2602 int n, code = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2603
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2604 VISIT(c, expr, e->v.Call.func);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2605 n = asdl_seq_LEN(e->v.Call.args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2606 VISIT_SEQ(c, expr, e->v.Call.args);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2607 if (e->v.Call.keywords) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2608 VISIT_SEQ(c, keyword, e->v.Call.keywords);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2609 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	2610 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2611 if (e->v.Call.starargs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2612 VISIT(c, expr, e->v.Call.starargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2613 code \|= 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2614 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2615 if (e->v.Call.kwargs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2616 VISIT(c, expr, e->v.Call.kwargs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2617 code \|= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2618 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2619 switch (code) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2620 case 0:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2621 ADDOP_I(c, CALL_FUNCTION, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2622 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2623 case 1:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2624 ADDOP_I(c, CALL_FUNCTION_VAR, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2625 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2626 case 2:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2627 ADDOP_I(c, CALL_FUNCTION_KW, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2628 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2629 case 3:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2630 ADDOP_I(c, CALL_FUNCTION_VAR_KW, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2631 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2632 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2633 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2634 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2635
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2636 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2637 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	2638 asdl_seq *generators, int gen_index,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2639 expr_ty elt)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2640 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2641 /* 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	2642 and then write to the element */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2643
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2644 comprehension_ty l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2645 basicblock start, anchor, skip, if_cleanup;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2646 int i, n;
35742 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 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2649 skip = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2650 if_cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2651 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2652
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2653 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	2654 anchor == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2655 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2656
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2657 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	2658 VISIT(c, expr, l->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2659 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2660 compiler_use_next_block(c, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2661 ADDOP_JREL(c, FOR_ITER, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2662 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2663 VISIT(c, expr, l->target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2664
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2665 /* 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	2666 n = asdl_seq_LEN(l->ifs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2667 for (i = 0; i < n; i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2668 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	2669 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2670 ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2671 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2672 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2673 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2674
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2675 if (++gen_index < asdl_seq_LEN(generators))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2676 if (!compiler_listcomp_generator(c, tmpname,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2677 generators, gen_index, elt))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2678 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2679
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2680 /* only append after the last for generator */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2681 if (gen_index >= asdl_seq_LEN(generators)) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2682 if (!compiler_nameop(c, tmpname, Load))
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2683 return 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2684 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	2685 ADDOP(c, LIST_APPEND);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2686
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2687 compiler_use_next_block(c, skip);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2688 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2689 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2690 ADDOP_I(c, JUMP_FORWARD, 1);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2691 if (i == 0)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2692 compiler_use_next_block(c, if_cleanup);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2693 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2694 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2695 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2696 compiler_use_next_block(c, anchor);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2697 /* delete the temporary list name added to locals */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2698 if (gen_index == 1)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2699 if (!compiler_nameop(c, tmpname, Del))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2700 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2701
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2702 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2703 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2704
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2705 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2706 compiler_listcomp(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2707 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2708 identifier tmp;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2709 int rc = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2710 asdl_seq *generators = e->v.ListComp.generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2711
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2712 assert(e->kind == ListComp_kind);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2713 tmp = compiler_new_tmpname(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2714 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2715 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2716 ADDOP_I(c, BUILD_LIST, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2717 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2718 if (compiler_nameop(c, tmp, Store))
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2719 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	2720 e->v.ListComp.elt);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2721 Py_DECREF(tmp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2722 return rc;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2723 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2724
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2725 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2726 compiler_genexp_generator(struct compiler *c,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2727 asdl_seq *generators, int gen_index,
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2728 expr_ty elt)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2729 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2730 /* 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	2731 and then write to the element */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2732
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2733 comprehension_ty ge;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2734 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	2735 int i, n;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2736
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2737 start = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2738 skip = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2739 if_cleanup = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2740 anchor = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2741 end = compiler_new_block(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2742
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2743 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	2744 anchor == NULL \|\| end == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2745 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2746
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2747 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	2748 ADDOP_JREL(c, SETUP_LOOP, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2749 if (!compiler_push_fblock(c, LOOP, start))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2750 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2751
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2752 if (gen_index == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2753 /* Receive outermost iter as an implicit argument */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2754 c->u->u_argcount = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2755 ADDOP_I(c, LOAD_FAST, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2756 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2757 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2758 /* Sub-iter - calculate on the fly */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2759 VISIT(c, expr, ge->iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2760 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2761 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2762 compiler_use_next_block(c, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2763 ADDOP_JREL(c, FOR_ITER, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2764 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2765 VISIT(c, expr, ge->target);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2766
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2767 /* 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	2768 n = asdl_seq_LEN(ge->ifs);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2769 for (i = 0; i < n; i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	2770 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	2771 VISIT(c, expr, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2772 ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2773 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2774 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2775 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2776
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2777 if (++gen_index < asdl_seq_LEN(generators))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2778 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	2779 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2780
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2781 /* only append after the last 'for' generator */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2782 if (gen_index >= asdl_seq_LEN(generators)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2783 VISIT(c, expr, elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2784 ADDOP(c, YIELD_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2785 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2786
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2787 compiler_use_next_block(c, skip);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2788 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2789 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2790 ADDOP_I(c, JUMP_FORWARD, 1);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2791 if (i == 0)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2792 compiler_use_next_block(c, if_cleanup);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2793
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2794 ADDOP(c, POP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2795 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2796 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2797 compiler_use_next_block(c, anchor);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2798 ADDOP(c, POP_BLOCK);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2799 compiler_pop_fblock(c, LOOP, start);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2800 compiler_use_next_block(c, end);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2801
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2802 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2803 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2804
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2805 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2806 compiler_genexp(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2807 {
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2808 static identifier name;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2809 PyCodeObject *co;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2810 expr_ty outermost_iter = ((comprehension_ty)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2811 (asdl_seq_GET(e->v.GeneratorExp.generators,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2812 0)))->iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2813
35881 29420bd3b5cb Correctly handle identifiers for anonymous scopes and align genexpr name with symtable.c Nick Coghlan <ncoghlan@gmail.com> parents: 35863 diff changeset	2814 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	2815 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	2816 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	2817 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	2818 }
35742 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 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	2821 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2822 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	2823 e->v.GeneratorExp.elt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2824 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	2825 compiler_exit_scope(c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2826 if (co == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2827 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2828
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2829 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	2830 Py_DECREF(co);
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	2831
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2832 VISIT(c, expr, outermost_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2833 ADDOP(c, GET_ITER);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2834 ADDOP_I(c, CALL_FUNCTION, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2835
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2836 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2837 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2838
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2839 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2840 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	2841 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2842 ADDOP_O(c, LOAD_CONST, k->arg, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2843 VISIT(c, expr, k->value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2844 return 1;
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
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2847 /* 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	2848 whether they are true or false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2849
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2850 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	2851 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2852
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2853 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2854 expr_constant(expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2855 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2856 switch (e->kind) {
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	2857 case Ellipsis_kind:
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	2858 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2859 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2860 return PyObject_IsTrue(e->v.Num.n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2861 case Str_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2862 return PyObject_IsTrue(e->v.Str.s);
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2863 case Name_kind:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2864 /* __debug__ is not assignable, so we can optimize
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2865 * it away in if and while statements */
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2866 if (strcmp(PyString_AS_STRING(e->v.Name.id),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2867 "__debug__") == 0)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2868 return ! Py_OptimizeFlag;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2869 /* fall through */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2870 default:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2871 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2872 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2873 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2874
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2875 /*
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2876 Implements the with statement from PEP 343.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2877
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2878 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	2879
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2880 with EXPR as VAR:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2881 BLOCK
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2882
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2883 It is implemented roughly as:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2884
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2885 context = EXPR
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2886 exit = context.__exit__ # not calling it
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2887 value = context.__enter__()
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2888 try:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2889 VAR = value # if VAR present in the syntax
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2890 BLOCK
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2891 finally:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2892 if an exception was raised:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2893 exc = copy of (exception, instance, traceback)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2894 else:
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2895 exc = (None, None, None)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2896 exit(*exc)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2897 */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2898 static int
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2899 compiler_with(struct compiler *c, stmt_ty s)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2900 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2901 static identifier enter_attr, exit_attr;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2902 basicblock block, finally;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2903 identifier tmpexit, tmpvalue = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2904
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2905 assert(s->kind == With_kind);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2906
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2907 if (!enter_attr) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2908 enter_attr = PyString_InternFromString("__enter__");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2909 if (!enter_attr)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2910 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2911 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2912 if (!exit_attr) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2913 exit_attr = PyString_InternFromString("__exit__");
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2914 if (!exit_attr)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2915 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2916 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2917
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2918 block = compiler_new_block(c);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2919 finally = compiler_new_block(c);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2920 if (!block \|\| !finally)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2921 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2922
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2923 /* Create a temporary variable to hold context.__exit__ */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2924 tmpexit = compiler_new_tmpname(c);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2925 if (tmpexit == NULL)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2926 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2927 PyArena_AddPyObject(c->c_arena, tmpexit);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2928
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2929 if (s->v.With.optional_vars) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2930 /* 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	2931 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	2932 because SETUP_FINALLY remembers the stack level.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2933 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	2934 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	2935 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	2936 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	2937 context.__exit__().
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2938 */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2939 tmpvalue = compiler_new_tmpname(c);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2940 if (tmpvalue == NULL)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2941 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2942 PyArena_AddPyObject(c->c_arena, tmpvalue);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2943 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2944
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2945 /* Evaluate EXPR */
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2946 VISIT(c, expr, s->v.With.context_expr);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2947
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2948 /* Squirrel away context.__exit__ */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2949 ADDOP(c, DUP_TOP);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2950 ADDOP_O(c, LOAD_ATTR, exit_attr, names);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2951 if (!compiler_nameop(c, tmpexit, Store))
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2952 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2953
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2954 /* Call context.__enter__() */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2955 ADDOP_O(c, LOAD_ATTR, enter_attr, names);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2956 ADDOP_I(c, CALL_FUNCTION, 0);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2957
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2958 if (s->v.With.optional_vars) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2959 /* Store it in tmpvalue */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2960 if (!compiler_nameop(c, tmpvalue, Store))
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2961 return 0;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2962 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2963 else {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2964 /* Discard result from context.__enter__() */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2965 ADDOP(c, POP_TOP);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2966 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2967
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2968 /* Start the try block */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2969 ADDOP_JREL(c, SETUP_FINALLY, finally);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2970
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2971 compiler_use_next_block(c, block);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2972 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	2973 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2974 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2975
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2976 if (s->v.With.optional_vars) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2977 /* 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	2978 if (!compiler_nameop(c, tmpvalue, Load) \|\|
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2979 !compiler_nameop(c, tmpvalue, Del))
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2980 return 0;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2981 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	2982 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2983
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2984 /* BLOCK code */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2985 VISIT_SEQ(c, stmt, s->v.With.body);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2986
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2987 /* End of try block; start the finally block */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2988 ADDOP(c, POP_BLOCK);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2989 compiler_pop_fblock(c, FINALLY_TRY, block);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2990
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2991 ADDOP_O(c, LOAD_CONST, Py_None, consts);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2992 compiler_use_next_block(c, finally);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2993 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	2994 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2995
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2996 /* 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	2997 if (!compiler_nameop(c, tmpexit, Load) \|\|
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	2998 !compiler_nameop(c, tmpexit, Del))
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	2999 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3000 ADDOP(c, WITH_CLEANUP);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3001
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3002 /* Finally block ends. */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3003 ADDOP(c, END_FINALLY);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3004 compiler_pop_fblock(c, FINALLY_END, finally);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3005 return 1;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3006 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3007
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3008 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3009 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	3010 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3011 int i, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3012
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3013 /* If expr e has a different line number than the last expr/stmt,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3014 set a new line number for the next instruction.
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3015 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3016 if (e->lineno > c->u->u_lineno) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3017 c->u->u_lineno = e->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3018 c->u->u_lineno_set = false;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3019 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3020 switch (e->kind) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3021 case BoolOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3022 return compiler_boolop(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3023 case BinOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3024 VISIT(c, expr, e->v.BinOp.left);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3025 VISIT(c, expr, e->v.BinOp.right);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3026 ADDOP(c, binop(c, e->v.BinOp.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3027 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3028 case UnaryOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3029 VISIT(c, expr, e->v.UnaryOp.operand);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3030 ADDOP(c, unaryop(e->v.UnaryOp.op));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3031 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3032 case Lambda_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3033 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	3034 case IfExp_kind:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	3035 return compiler_ifexp(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3036 case Dict_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3037 /* XXX get rid of arg? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3038 ADDOP_I(c, BUILD_MAP, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3039 n = asdl_seq_LEN(e->v.Dict.values);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3040 /* 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	3041 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	3042 for (i = 0; i < n; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3043 ADDOP(c, DUP_TOP);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3044 VISIT(c, expr,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3045 (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	3046 ADDOP(c, ROT_TWO);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3047 VISIT(c, expr,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3048 (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	3049 ADDOP(c, STORE_SUBSCR);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3050 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3051 break;
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39676 diff changeset	3052 case Set_kind:
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39676 diff changeset	3053 n = asdl_seq_LEN(e->v.Set.elts);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39676 diff changeset	3054 VISIT_SEQ(c, expr, e->v.Set.elts);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39676 diff changeset	3055 ADDOP_I(c, BUILD_SET, n);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39676 diff changeset	3056 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3057 case ListComp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3058 return compiler_listcomp(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3059 case GeneratorExp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3060 return compiler_genexp(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3061 case Yield_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3062 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	3063 return compiler_error(c, "'yield' outside function");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3064 if (e->v.Yield.value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3065 VISIT(c, expr, e->v.Yield.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3066 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3067 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3068 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3069 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3070 ADDOP(c, YIELD_VALUE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3071 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3072 case Compare_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3073 return compiler_compare(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3074 case Call_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3075 return compiler_call(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3076 case Num_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3077 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	3078 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3079 case Str_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3080 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	3081 break;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40788 diff changeset	3082 case Bytes_kind:
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40788 diff changeset	3083 ADDOP_O(c, LOAD_CONST, e->v.Bytes.s, consts);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40788 diff changeset	3084 ADDOP(c, MAKE_BYTES);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40788 diff changeset	3085 break;
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3086 case Ellipsis_kind:
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3087 ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	3088 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3089 /* 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	3090 case Attribute_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3091 if (e->v.Attribute.ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3092 VISIT(c, expr, e->v.Attribute.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3093 switch (e->v.Attribute.ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3094 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3095 ADDOP(c, DUP_TOP);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3096 /* Fall through to load */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3097 case Load:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3098 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	3099 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3100 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3101 ADDOP(c, ROT_TWO);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3102 /* Fall through to save */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3103 case Store:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3104 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	3105 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3106 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3107 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	3108 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3109 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3110 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3111 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3112 "param invalid in attribute expression");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3113 return 0;
35742 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 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3116 case Subscript_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3117 switch (e->v.Subscript.ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3118 case AugLoad:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3119 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3120 VISIT_SLICE(c, e->v.Subscript.slice, AugLoad);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3121 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3122 case Load:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3123 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3124 VISIT_SLICE(c, e->v.Subscript.slice, Load);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3125 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3126 case AugStore:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3127 VISIT_SLICE(c, e->v.Subscript.slice, AugStore);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3128 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3129 case Store:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3130 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3131 VISIT_SLICE(c, e->v.Subscript.slice, Store);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3132 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3133 case Del:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3134 VISIT(c, expr, e->v.Subscript.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3135 VISIT_SLICE(c, e->v.Subscript.slice, Del);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3136 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3137 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3138 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3139 PyErr_SetString(PyExc_SystemError,
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3140 "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	3141 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3142 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3143 break;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3144 case Name_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3145 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	3146 /* 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	3147 case List_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3148 return compiler_list(c, e);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3149 case Tuple_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3150 return compiler_tuple(c, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3151 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3152 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3153 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3156 compiler_augassign(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3157 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3158 expr_ty e = s->v.AugAssign.target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3159 expr_ty auge;
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 assert(s->kind == AugAssign_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3162
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3163 switch (e->kind) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3164 case Attribute_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3165 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	3166 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	3167 if (auge == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3168 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3169 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3170 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3171 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	3172 auge->v.Attribute.ctx = AugStore;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3173 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3174 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3175 case Subscript_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3176 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	3177 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	3178 if (auge == NULL)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3179 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3180 VISIT(c, expr, auge);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3181 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3182 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	3183 auge->v.Subscript.ctx = AugStore;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3184 VISIT(c, expr, auge);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3185 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3186 case Name_kind:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3187 if (!compiler_nameop(c, e->v.Name.id, Load))
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3188 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3189 VISIT(c, expr, s->v.AugAssign.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3190 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	3191 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	3192 default:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3193 PyErr_Format(PyExc_SystemError,
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3194 "invalid node type (%d) for augmented assignment",
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3195 e->kind);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3196 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3197 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3198 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3199 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3200
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3201 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3202 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	3203 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3204 struct fblockinfo *f;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3205 if (c->u->u_nfblocks >= CO_MAXBLOCKS) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3206 PyErr_SetString(PyExc_SystemError,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3207 "too many statically nested blocks");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3208 return 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3209 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3210 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	3211 f->fb_type = t;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3212 f->fb_block = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3213 return 1;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3216 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3217 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	3218 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3219 struct compiler_unit *u = c->u;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3220 assert(u->u_nfblocks > 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3221 u->u_nfblocks--;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3222 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	3223 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	3224 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3225
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3226 static int
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3227 compiler_in_loop(struct compiler *c) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3228 int i;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3229 struct compiler_unit *u = c->u;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3230 for (i = 0; i < u->u_nfblocks; ++i) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3231 if (u->u_fblock[i].fb_type == LOOP)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3232 return 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3233 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3234 return 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3235 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3236 /* Raises a SyntaxError and returns 0.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3237 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	3238 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3239
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3240 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3241 compiler_error(struct compiler c, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3242 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3243 PyObject *loc;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3244 PyObject u = NULL, v = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3245
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3246 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	3247 if (!loc) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3248 Py_INCREF(Py_None);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3249 loc = Py_None;
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 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	3252 Py_None, loc);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3253 if (!u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3254 goto exit;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3255 v = Py_BuildValue("(zO)", errstr, u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3256 if (!v)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3257 goto exit;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3258 PyErr_SetObject(PyExc_SyntaxError, v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3259 exit:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3260 Py_DECREF(loc);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3261 Py_XDECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3262 Py_XDECREF(v);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3263 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3264 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3265
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3266 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3267 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	3268 expr_context_ty ctx)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3269 {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3270 int op = 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3271
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3272 /* XXX this code is duplicated */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3273 switch (ctx) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3274 case AugLoad: /* fall through to Load */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3275 case Load: op = BINARY_SUBSCR; break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3276 case AugStore:/* fall through to Store */
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3277 case Store: op = STORE_SUBSCR; break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3278 case Del: op = DELETE_SUBSCR; break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3279 case Param:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3280 PyErr_Format(PyExc_SystemError,
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3281 "invalid %s kind %d in subscript\n",
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3282 kind, ctx);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3283 return 0;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3284 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3285 if (ctx == AugLoad) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3286 ADDOP_I(c, DUP_TOPX, 2);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3287 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3288 else if (ctx == AugStore) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3289 ADDOP(c, ROT_THREE);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3290 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3291 ADDOP(c, op);
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3292 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3293 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3294
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3295 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3296 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	3297 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3298 int n = 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3299 assert(s->kind == Slice_kind);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3300
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3301 /* 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	3302 if (s->v.Slice.lower) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3303 VISIT(c, expr, s->v.Slice.lower);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3304 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3305 else {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3306 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	3307 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3308
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3309 if (s->v.Slice.upper) {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3310 VISIT(c, expr, s->v.Slice.upper);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3311 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3312 else {
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3313 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	3314 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3315
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3316 if (s->v.Slice.step) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3317 n++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3318 VISIT(c, expr, s->v.Slice.step);
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_I(c, BUILD_SLICE, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3321 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3322 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3323
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3324 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3325 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	3326 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3327 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	3328
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3329 assert(s->v.Slice.step == NULL);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3330 if (s->v.Slice.lower) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3331 slice_offset++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3332 stack_count++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3333 if (ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3334 VISIT(c, expr, s->v.Slice.lower);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3335 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3336 if (s->v.Slice.upper) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3337 slice_offset += 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3338 stack_count++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3339 if (ctx != AugStore)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3340 VISIT(c, expr, s->v.Slice.upper);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3341 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3342
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3343 if (ctx == AugLoad) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3344 switch (stack_count) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3345 case 0: ADDOP(c, DUP_TOP); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3346 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	3347 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	3348 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3349 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3350 else if (ctx == AugStore) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3351 switch (stack_count) {
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3352 case 0: ADDOP(c, ROT_TWO); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3353 case 1: ADDOP(c, ROT_THREE); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3354 case 2: ADDOP(c, ROT_FOUR); break;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3355 }
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3356 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3357
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3358 switch (ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3359 case AugLoad: /* fall through to Load */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3360 case Load: op = SLICE; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3361 case AugStore:/* fall through to Store */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3362 case Store: op = STORE_SLICE; break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3363 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	3364 case Param:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3365 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3366 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3367 "param invalid in simple slice");
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3368 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3369 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3370
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3371 ADDOP(c, op + slice_offset);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3372 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3373 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3374
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3375 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3376 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	3377 expr_context_ty ctx)
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 switch (s->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3380 case Slice_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3381 return compiler_slice(c, s, ctx);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3382 case Index_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3383 VISIT(c, expr, s->v.Index.value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3384 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3385 case ExtSlice_kind:
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3386 default:
35893 825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3387 PyErr_SetString(PyExc_SystemError,
825655bfdf20 Last batch of ref leaks in new AST code. Neal Norwitz <nnorwitz@gmail.com> parents: 35881 diff changeset	3388 "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	3389 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3390 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3391 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3392 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3393
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3394 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3395 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	3396 {
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	3397 char * kindname = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3398 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	3399 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	3400 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	3401 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	3402 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	3403 }
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	3404 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3405 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	3406 kindname = "slice";
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3407 if (!s->v.Slice.step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3408 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	3409 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	3410 if (!compiler_slice(c, s, ctx))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3411 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3412 }
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	3413 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	3414 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	3415 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	3416 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	3417 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	3418 for (i = 0; i < n; i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3419 slice_ty sub = (slice_ty)asdl_seq_GET(
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3420 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	3421 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	3422 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	3423 }
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	3424 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	3425 }
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	3426 break;
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3427 default:
8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3428 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	3429 "invalid subscript kind %d", s->kind);
36079 8ebe34eb3eb7 Handle more error conditions with SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 36076 diff changeset	3430 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3431 }
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	3432 return compiler_handle_subscr(c, kindname, ctx);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3433 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3434
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3435 /* End of the compiler section, beginning of the assembler section */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3436
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3437 /* 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	3438 post records the block indices in post-order.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3439
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3440 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	3441 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3442
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3443 struct assembler {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3444 PyObject a_bytecode; / string containing bytecode */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3445 int a_offset; /* offset into bytecode */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3446 int a_nblocks; /* number of reachable blocks */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3447 basicblock *a_postorder; / list of blocks in dfs postorder */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3448 PyObject a_lnotab; / string containing lnotab */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3449 int a_lnotab_off; /* offset into lnotab */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3450 int a_lineno; /* last lineno of emitted instruction */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3451 int a_lineno_off; /* bytecode offset of last lineno */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3452 };
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3453
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3454 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3455 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	3456 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3457 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3458 struct instr *instr = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3459
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3460 if (b->b_seen)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3461 return;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3462 b->b_seen = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3463 if (b->b_next != NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3464 dfs(c, b->b_next, a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3465 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3466 instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3467 if (instr->i_jrel \|\| instr->i_jabs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3468 dfs(c, instr->i_target, a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3469 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3470 a->a_postorder[a->a_nblocks++] = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3471 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3472
35860 9b885c934144 make internal method static Neal Norwitz <nnorwitz@gmail.com> parents: 35797 diff changeset	3473 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3474 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	3475 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3476 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3477 struct instr *instr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3478 if (b->b_seen \|\| b->b_startdepth >= depth)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3479 return maxdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3480 b->b_seen = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3481 b->b_startdepth = depth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3482 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3483 instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3484 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	3485 if (depth > maxdepth)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3486 maxdepth = depth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3487 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	3488 if (instr->i_jrel \|\| instr->i_jabs) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3489 maxdepth = stackdepth_walk(c, instr->i_target,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3490 depth, maxdepth);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3491 if (instr->i_opcode == JUMP_ABSOLUTE \|\|
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3492 instr->i_opcode == JUMP_FORWARD) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3493 goto out; /* remaining code is dead */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3494 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3495 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3496 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3497 if (b->b_next)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3498 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	3499 out:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3500 b->b_seen = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3501 return maxdepth;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3502 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3503
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3504 /* 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	3505 * 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	3506 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3507 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3508 stackdepth(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3509 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3510 basicblock b, entryblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3511 entryblock = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3512 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	3513 b->b_seen = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3514 b->b_startdepth = INT_MIN;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3515 entryblock = b;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3516 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3517 if (!entryblock)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3518 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3519 return stackdepth_walk(c, entryblock, 0, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3520 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3521
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3522 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3523 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	3524 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3525 memset(a, 0, sizeof(struct assembler));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3526 a->a_lineno = firstlineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3527 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	3528 if (!a->a_bytecode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3529 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3530 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	3531 if (!a->a_lnotab)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3532 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3533 a->a_postorder = (basicblock **)PyObject_Malloc(
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3534 sizeof(basicblock ) nblocks);
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3535 if (!a->a_postorder) {
aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3536 PyErr_NoMemory();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3537 return 0;
36076 aa7d7df853d5 Set MemoryError when alloc fails Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3538 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3539 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3540 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3541
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3542 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3543 assemble_free(struct assembler *a)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3544 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3545 Py_XDECREF(a->a_bytecode);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3546 Py_XDECREF(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3547 if (a->a_postorder)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3548 PyObject_Free(a->a_postorder);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3549 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3550
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3551 /* 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	3552
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3553 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3554 instrsize(struct instr *instr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3555 {
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	3556 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	3557 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	3558 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	3559 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	3560 return 3;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3561 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3562
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3563 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3564 blocksize(basicblock *b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3565 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3566 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3567 int size = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3568
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3569 for (i = 0; i < b->b_iused; i++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3570 size += instrsize(&b->b_instr[i]);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3571 return size;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3572 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3573
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3574 /* All about a_lnotab.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3575
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3576 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	3577 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	3578 for tracebacks).
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24818 diff changeset	3579
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3580 The array is conceptually a list of
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3581 (bytecode offset increment, line number increment)
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3582 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	3583
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3584 byte code offset source code line number
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3585 0 1
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3586 6 2
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3587 50 7
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3588 350 307
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3589 361 308
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3590
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3591 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	3592 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	3593
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3594 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	3595
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3596 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	3597 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	3598 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	3599 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	3600 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	3601 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	3602 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	3603 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	3604
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3605 lineno = addr = 0
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3606 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	3607 addr += addr_incr
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3608 if addr > A:
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3609 return lineno
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3610 lineno += line_incr
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3611
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3612 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	3613 the line # increment in each pair generated must be 0 until the remaining addr
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3614 increment is < 256. So, in the example above, assemble_lnotab (it used
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3615 to be called com_set_lineno) should not (as was actually done until 2.2)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3616 expand 300, 300 to 255, 255, 45, 45,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3617 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	3618 */
889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3619
17518 f939ce52a734 Make some private symbols static. Guido van Rossum <guido@python.org> parents: 17355 diff changeset	3620 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3621 assemble_lnotab(struct assembler a, struct instr i)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3622 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3623 int d_bytecode, d_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3624 int len;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3625 unsigned char *lnotab;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3626
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3627 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	3628 d_lineno = i->i_lineno - a->a_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3629
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3630 assert(d_bytecode >= 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3631 assert(d_lineno >= 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3632
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3633 /* XXX(nnorwitz): is there a better way to handle this?
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3634 for loops are special, we want to be able to trace them
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3635 each time around, so we need to set an extra line number. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3636 if (d_lineno == 0 && i->i_opcode != FOR_ITER)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3637 return 1;
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 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	3640 int j, nbytes, ncodes = d_bytecode / 255;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3641 nbytes = a->a_lnotab_off + 2 * ncodes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3642 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3643 if (nbytes >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3644 if (len * 2 < nbytes)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3645 len = nbytes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3646 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3647 len *= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3648 if (_PyString_Resize(&a->a_lnotab, len) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3649 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3650 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3651 lnotab = (unsigned char *)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3652 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	3653 for (j = 0; j < ncodes; j++) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3654 *lnotab++ = 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3655 *lnotab++ = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3656 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3657 d_bytecode -= ncodes * 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3658 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	3659 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3660 assert(d_bytecode <= 255);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3661 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	3662 int j, nbytes, ncodes = d_lineno / 255;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3663 nbytes = a->a_lnotab_off + 2 * ncodes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3664 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3665 if (nbytes >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3666 if (len * 2 < nbytes)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3667 len = nbytes;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3668 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3669 len *= 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3670 if (_PyString_Resize(&a->a_lnotab, len) < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3671 return 0;
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3672 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3673 lnotab = (unsigned char *)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3674 PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3675 *lnotab++ = d_bytecode;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3676 *lnotab++ = 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3677 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	3678 for (j = 1; j < ncodes; j++) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3679 *lnotab++ = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3680 *lnotab++ = 255;
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 d_lineno -= ncodes * 255;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3683 a->a_lnotab_off += ncodes * 2;
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14117 diff changeset	3684 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3685
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3686 len = PyString_GET_SIZE(a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3687 if (a->a_lnotab_off + 2 >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3688 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	3689 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3690 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3691 lnotab = (unsigned char *)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37057 diff changeset	3692 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	3693
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3694 a->a_lnotab_off += 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3695 if (d_bytecode) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3696 *lnotab++ = d_bytecode;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3697 *lnotab++ = d_lineno;
73 3028acaa56b0 Compile class definitions. Guido van Rossum <guido@python.org> parents: 69 diff changeset	3698 }
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3699 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	3700 *lnotab++ = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3701 *lnotab++ = d_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3702 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3703 a->a_lineno = i->i_lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3704 a->a_lineno_off = a->a_offset;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	3705 return 1;
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	3706 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3707
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3708 /* assemble_emit()
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3709 Extend the bytecode with a new instruction.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3710 Update lnotab if necessary.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3711 */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3712
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	3713 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3714 assemble_emit(struct assembler a, struct instr i)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3715 {
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	3716 int size, arg = 0, ext = 0;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3717 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	3718 char *code;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3719
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	3720 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	3721 if (i->i_hasarg) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3722 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	3723 ext = arg >> 16;
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31764 diff changeset	3724 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3725 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	3726 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3727 if (a->a_offset + size >= len) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3728 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	3729 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	3730 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3731 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	3732 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	3733 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	3734 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	3735 *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	3736 *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	3737 *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	3738 arg &= 0xffff;
4991 8276916e1ea8 Add co_stacksize field to codeobject structure, and stacksize argument Guido van Rossum <guido@python.org> parents: 4905 diff changeset	3739 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3740 *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	3741 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	3742 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	3743 *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	3744 *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	3745 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3746 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	3747 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	3748
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	3749 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3750 assemble_jump_offsets(struct assembler a, struct compiler c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3751 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3752 basicblock *b;
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3753 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	3754 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3755
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3756 /* 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	3757 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	3758 start:
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3759 totsize = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3760 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	3761 b = a->a_postorder[i];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3762 bsize = blocksize(b);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3763 b->b_offset = totsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3764 totsize += bsize;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 73 diff changeset	3765 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3766 extended_arg_count = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3767 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	3768 bsize = b->b_offset;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3769 for (i = 0; i < b->b_iused; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3770 struct instr *instr = &b->b_instr[i];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3771 /* Relative jumps are computed relative to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3772 the instruction pointer after fetching
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3773 the jump instruction.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3774 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3775 bsize += instrsize(instr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3776 if (instr->i_jabs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3777 instr->i_oparg = instr->i_target->b_offset;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3778 else if (instr->i_jrel) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3779 int delta = instr->i_target->b_offset - bsize;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3780 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	3781 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3782 else
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3783 continue;
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3784 if (instr->i_oparg > 0xffff)
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3785 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	3786 }
41243cb4ea05 Another "if 0:" hack, this time to complain about otherwise invisible Tim Peters <tim.peters@gmail.com> parents: 18274 diff changeset	3787 }
35790 f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3788
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3789 /* 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	3790 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	3791 with a better solution.
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3792
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3793 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	3794 of a loop?
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3795
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3796 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	3797 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	3798 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	3799 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	3800
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3801 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	3802 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	3803 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	3804 fairly quickly.
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3805 */
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3806 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	3807 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	3808 goto start;
f7b0cbea905b Fix problem handling EXTENDED_ARGs from SF bug # 1333982 Neal Norwitz <nnorwitz@gmail.com> parents: 35789 diff changeset	3809 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3810 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3811
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3812 static PyObject *
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3813 dict_keys_inorder(PyObject *dict, int offset)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3814 {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3815 PyObject tuple, k, *v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36225 diff changeset	3816 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	3817
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3818 tuple = PyTuple_New(size);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3819 if (tuple == NULL)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3820 return NULL;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3821 while (PyDict_Next(dict, &pos, &k, &v)) {
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3822 i = PyInt_AS_LONG(v);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3823 k = PyTuple_GET_ITEM(k, 0);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3824 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	3825 assert((i - offset) < size);
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3826 assert((i - offset) >= 0);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3827 PyTuple_SET_ITEM(tuple, i - offset, k);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3828 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3829 return tuple;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3830 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3831
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3832 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3833 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	3834 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3835 PySTEntryObject *ste = c->u->u_ste;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3836 int flags = 0, n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3837 if (ste->ste_type != ModuleBlock)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3838 flags \|= CO_NEWLOCALS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3839 if (ste->ste_type == FunctionBlock) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3840 if (!ste->ste_unoptimized)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3841 flags \|= CO_OPTIMIZED;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3842 if (ste->ste_nested)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3843 flags \|= CO_NESTED;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3844 if (ste->ste_generator)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3845 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	3846 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3847 if (ste->ste_varargs)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3848 flags \|= CO_VARARGS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3849 if (ste->ste_varkeywords)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3850 flags \|= CO_VARKEYWORDS;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3851 if (ste->ste_generator)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3852 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	3853
d6cbc71b8010 Generally inehrit codeflags that are in PyCF_MASK, instead of writing it out Thomas Wouters <thomas@python.org> parents: 36726 diff changeset	3854 /* (Only) inherit compilerflags in PyCF_MASK */
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3855 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	3856
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3857 n = PyDict_Size(c->u->u_freevars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3858 if (n < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3859 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3860 if (n == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3861 n = PyDict_Size(c->u->u_cellvars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3862 if (n < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3863 return -1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3864 if (n == 0) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3865 flags \|= CO_NOFREE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3866 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3867 }
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 return flags;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	3870 }
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	3871
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	3872 static PyCodeObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3873 makecode(struct compiler c, struct assembler a)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	3874 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3875 PyObject *tmp;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3876 PyCodeObject *co = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3877 PyObject *consts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3878 PyObject *names = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3879 PyObject *varnames = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3880 PyObject *filename = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3881 PyObject *name = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3882 PyObject *freevars = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3883 PyObject *cellvars = NULL;
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3884 PyObject *bytecode = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3885 int nlocals, flags;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3886
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3887 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	3888 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3889 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3890 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	3891 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3892
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3893 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	3894 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	3895 if (!consts \|\| !names \|\| !varnames)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3896 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3897
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3898 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	3899 if (!cellvars)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3900 goto error;
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3901 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	3902 if (!freevars)
1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3903 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3904 filename = PyString_FromString(c->c_filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3905 if (!filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3906 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3907
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	3908 nlocals = PyDict_Size(c->u->u_varnames);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3909 flags = compute_code_flags(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3910 if (flags < 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3911 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3912
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3913 bytecode = PyCode_Optimize(a->a_bytecode, consts, names, a->a_lnotab);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3914 if (!bytecode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3915 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3916
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3917 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	3918 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3919 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3920 Py_DECREF(consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3921 consts = tmp;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3922
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	3923 co = PyCode_New(c->u->u_argcount, c->u->u_kwonlyargcount,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	3924 nlocals, stackdepth(c), flags,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3925 bytecode, consts, names, varnames,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3926 freevars, cellvars,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3927 filename, c->u->u_name,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3928 c->u->u_firstlineno,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3929 a->a_lnotab);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3930 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3931 Py_XDECREF(consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3932 Py_XDECREF(names);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3933 Py_XDECREF(varnames);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3934 Py_XDECREF(filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3935 Py_XDECREF(name);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3936 Py_XDECREF(freevars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3937 Py_XDECREF(cellvars);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3938 Py_XDECREF(bytecode);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3939 return co;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3940 }
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	3941
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3942
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3943 /* For debugging purposes only */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3944 #if 0
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3945 static void
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3946 dump_instr(const struct instr *i)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3947 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3948 const char *jrel = i->i_jrel ? "jrel " : "";
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3949 const char *jabs = i->i_jabs ? "jabs " : "";
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3950 char arg[128];
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3951
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3952 *arg = '\0';
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3953 if (i->i_hasarg)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3954 sprintf(arg, "arg: %d ", i->i_oparg);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3955
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3956 fprintf(stderr, "line: %d, opcode: %d %s%s%s\n",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3957 i->i_lineno, i->i_opcode, arg, jabs, jrel);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3958 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3959
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3960 static void
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3961 dump_basicblock(const basicblock *b)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3962 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3963 const char *seen = b->b_seen ? "seen " : "";
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3964 const char *b_return = b->b_return ? "return " : "";
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3965 fprintf(stderr, "used: %d, depth: %d, offset: %d %s%s\n",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3966 b->b_iused, b->b_startdepth, b->b_offset, seen, b_return);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3967 if (b->b_instr) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3968 int i;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3969 for (i = 0; i < b->b_iused; i++) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3970 fprintf(stderr, " [%02d] ", i);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3971 dump_instr(b->b_instr + i);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3972 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3973 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3974 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3975 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3976
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3977 static PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3978 assemble(struct compiler *c, int addNone)
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	3979 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3980 basicblock b, entryblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3981 struct assembler a;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3982 int i, j, nblocks;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3983 PyCodeObject *co = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3984
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3985 /* 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	3986 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	3987 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	3988 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3989 if (!c->u->u_curblock->b_return) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3990 NEXT_BLOCK(c);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3991 if (addNone)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3992 ADDOP_O(c, LOAD_CONST, Py_None, consts);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3993 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	3994 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3995
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3996 nblocks = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3997 entryblock = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3998 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	3999 nblocks++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4000 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	4001 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4002
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4003 /* Set firstlineno if it wasn't explicitly set. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4004 if (!c->u->u_firstlineno) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4005 if (entryblock && entryblock->b_instr)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4006 c->u->u_firstlineno = entryblock->b_instr->i_lineno;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4007 else
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4008 c->u->u_firstlineno = 1;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4009 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4010 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	4011 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4012 dfs(c, entryblock, &a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4013
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4014 /* 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	4015 assemble_jump_offsets(&a, c);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4016
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4017 /* Emit code in reverse postorder from dfs. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4018 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	4019 b = a.a_postorder[i];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4020 for (j = 0; j < b->b_iused; j++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4021 if (!assemble_emit(&a, &b->b_instr[j]))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4022 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	4023 }
35742 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 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	4026 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4027 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	4028 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4029
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4030 co = makecode(c, &a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4031 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4032 assemble_free(&a);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4033 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	4034 }

Mercurial > cpython-lru_cache-weakref

annotate Python/compile.c @ 40894:0ea24f4f2467