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

annotate Python/compile.c @ 80589:ffb2fa900cb7 3.3

Issue #16546: make ast.YieldFrom argument mandatory.

author	Mark Dickinson <mdickinson@enthought.com>
date	Sun, 25 Nov 2012 14:36:26 +0000
parents	ab02cd145f56
children	72f0fd0c4d90 03f92a9f0875

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
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 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
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	11 * this file.
40450 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"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	28 #include "ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	29 #include "code.h"
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	30 #include "symtable.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31 #include "opcode.h"
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5373 diff changeset	32
5164 8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	33 int Py_OptimizeFlag = 0;
8c277f29b535 Add global Py_OptimizeFlag. SET_LINENO is omitted again unless this is Guido van Rossum <guido@python.org> parents: 5119 diff changeset	34
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	35 #define DEFAULT_BLOCK_SIZE 16
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	36 #define DEFAULT_BLOCKS 8
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	37 #define DEFAULT_CODE_SIZE 128
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	38 #define DEFAULT_LNOTAB_SIZE 16
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	39
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	40 #define COMP_GENEXP 0
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	41 #define COMP_LISTCOMP 1
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	42 #define COMP_SETCOMP 2
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42089 diff changeset	43 #define COMP_DICTCOMP 3
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	44
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	45 struct instr {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	46 unsigned i_jabs : 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	47 unsigned i_jrel : 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	48 unsigned i_hasarg : 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	49 unsigned char i_opcode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	50 int i_oparg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	51 struct basicblock_ i_target; / target block (if jump instruction) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	52 int i_lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	53 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	54
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	55 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	56 /* 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	57 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	58 block, not to be confused with b_next, which is next by control flow. */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	59 struct basicblock_ *b_list;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	60 /* number of instructions used */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	61 int b_iused;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	62 /* length of instruction array (b_instr) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	63 int b_ialloc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	64 /* pointer to an array of instructions, initially NULL */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	65 struct instr *b_instr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	66 /* If b_next is non-NULL, it is a pointer to the next
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	67 block reached by normal control flow. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	68 struct basicblock_ *b_next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	69 /* b_seen is used to perform a DFS of basicblocks. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	70 unsigned b_seen : 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	71 /* b_return is true if a RETURN_VALUE opcode is inserted. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	72 unsigned b_return : 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	73 /* depth of stack upon entry of block, computed by stackdepth() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	74 int b_startdepth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	75 /* instruction offset for block, computed by assemble_jump_offsets() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	76 int b_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	77 } basicblock;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	78
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	79 /* fblockinfo tracks the current frame block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	80
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	81 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	82 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	83 compiler IR.
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	86 enum fblocktype { LOOP, EXCEPT, FINALLY_TRY, FINALLY_END };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	87
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	88 struct fblockinfo {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	89 enum fblocktype fb_type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	90 basicblock *fb_block;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	91 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	92
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	93 enum {
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	94 COMPILER_SCOPE_MODULE,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	95 COMPILER_SCOPE_CLASS,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	96 COMPILER_SCOPE_FUNCTION,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	97 COMPILER_SCOPE_COMPREHENSION,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	98 };
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	99
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	100 /* The following items change on entry and exit of code blocks.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	101 They must be saved and restored when returning to a block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	102 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	103 struct compiler_unit {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	104 PySTEntryObject *u_ste;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	105
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	106 PyObject *u_name;
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	107 PyObject u_qualname; / dot-separated qualified name (lazy) */
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	108 int u_scope_type;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	109
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	110 /* The following fields are dicts that map objects to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	111 the index of them in co_XXX. The index is used as
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	112 the argument for opcodes that refer to those collections.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	113 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	114 PyObject u_consts; / all constants */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	115 PyObject u_names; / all names */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	116 PyObject u_varnames; / local variables */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	117 PyObject u_cellvars; / cell variables */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	118 PyObject u_freevars; / free variables */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	119
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	120 PyObject u_private; / for private name mangling */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	121
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	122 int u_argcount; /* number of arguments for block */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	123 int u_kwonlyargcount; /* number of keyword only arguments for block */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	124 /* Pointer to the most recently allocated block. By following b_list
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	125 members, you can reach all early allocated blocks. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	126 basicblock *u_blocks;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	127 basicblock u_curblock; / pointer to current block */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	128
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	129 int u_nfblocks;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	130 struct fblockinfo u_fblock[CO_MAXBLOCKS];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	131
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	132 int u_firstlineno; /* the first lineno of the block */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	133 int u_lineno; /* the lineno for the current stmt */
64861 861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64620 diff changeset	134 int u_col_offset; /* the offset of the current stmt */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	135 int u_lineno_set; /* boolean to indicate whether instr
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	136 has been generated with current lineno */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	137 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	138
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	139 /* This struct captures the global state of a compilation.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	140
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	141 The u pointer points to the current compilation unit, while units
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	142 for enclosing blocks are stored in c_stack. The u and c_stack are
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	143 managed by compiler_enter_scope() and compiler_exit_scope().
80239 ab02cd145f56 Issue #5765: Apply a hard recursion limit in the compiler Nick Coghlan <ncoghlan@gmail.com> parents: 78172 diff changeset	144
ab02cd145f56 Issue #5765: Apply a hard recursion limit in the compiler Nick Coghlan <ncoghlan@gmail.com> parents: 78172 diff changeset	145 Note that we don't track recursion levels during compilation - the
ab02cd145f56 Issue #5765: Apply a hard recursion limit in the compiler Nick Coghlan <ncoghlan@gmail.com> parents: 78172 diff changeset	146 task of detecting and rejecting excessive levels of nesting is
ab02cd145f56 Issue #5765: Apply a hard recursion limit in the compiler Nick Coghlan <ncoghlan@gmail.com> parents: 78172 diff changeset	147 handled by the symbol analysis pass.
ab02cd145f56 Issue #5765: Apply a hard recursion limit in the compiler Nick Coghlan <ncoghlan@gmail.com> parents: 78172 diff changeset	148
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	149 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	150
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	151 struct compiler {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	152 const char *c_filename;
70435 27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	153 PyObject *c_filename_obj;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	154 struct symtable *c_st;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	155 PyFutureFeatures c_future; / pointer to module's __future__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	156 PyCompilerFlags *c_flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	157
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	158 int c_optimize; /* optimization level */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	159 int c_interactive; /* true if in interactive mode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	160 int c_nestlevel;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	161
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	162 struct compiler_unit u; / compiler state for current block */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	163 PyObject c_stack; / Python list holding compiler_unit ptrs */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	164 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	165 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	166
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	167 static int compiler_enter_scope(struct compiler , identifier, int, void , int);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	168 static void compiler_free(struct compiler *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	169 static basicblock compiler_new_block(struct compiler );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	170 static int compiler_next_instr(struct compiler , basicblock );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	171 static int compiler_addop(struct compiler *, int);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	172 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	173 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	174 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	175 static basicblock compiler_use_new_block(struct compiler );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	176 static int compiler_error(struct compiler , const char );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	177 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	178
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	179 static PyCodeObject compiler_mod(struct compiler , mod_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	180 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	181 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	182 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	183 static int compiler_augassign(struct compiler *, stmt_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	184 static int compiler_visit_slice(struct compiler *, slice_ty,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	185 expr_context_ty);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	186
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	187 static int compiler_push_fblock(struct compiler *, enum fblocktype,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	188 basicblock *);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	189 static void compiler_pop_fblock(struct compiler *, enum fblocktype,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	190 basicblock *);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	191 /* 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	192 static int compiler_in_loop(struct compiler *);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	193
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	194 static int inplace_binop(struct compiler *, operator_ty);
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	195 static int expr_constant(struct compiler *, expr_ty);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	196
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	197 static int compiler_with(struct compiler *, stmt_ty, int);
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	198 static int compiler_call_helper(struct compiler *c, int n,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	199 asdl_seq *args,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	200 asdl_seq *keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	201 expr_ty starargs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	202 expr_ty kwargs);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	203 static int compiler_try_except(struct compiler *, stmt_ty);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	204
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	205 static PyCodeObject assemble(struct compiler , int addNone);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	206 static PyObject *__doc__;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	207
53816 911df82bc25d add a replacement API for PyCObject, PyCapsule #5630 Benjamin Peterson <benjamin@python.org> parents: 51959 diff changeset	208 #define COMPILER_CAPSULE_NAME_COMPILER_UNIT "compile.c compiler unit"
911df82bc25d add a replacement API for PyCObject, PyCapsule #5630 Benjamin Peterson <benjamin@python.org> parents: 51959 diff changeset	209
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	210 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	211 _Py_Mangle(PyObject privateobj, PyObject ident)
33100 356887410bde Fix bug Michael W. Hudson <mwh@python.net> parents: 32977 diff changeset	212 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	213 /* Name mangling: __private becomes _classname__private.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	214 This is independent from how the name is used. */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	215 PyObject *result;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	216 size_t nlen, plen, ipriv;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	217 Py_UCS4 maxchar;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	218 if (privateobj == NULL \|\| !PyUnicode_Check(privateobj) \|\|
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	219 PyUnicode_READ_CHAR(ident, 0) != '_' \|\|
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	220 PyUnicode_READ_CHAR(ident, 1) != '_') {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	221 Py_INCREF(ident);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	222 return ident;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	223 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	224 nlen = PyUnicode_GET_LENGTH(ident);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	225 plen = PyUnicode_GET_LENGTH(privateobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	226 /* Don't mangle __id__ or names with dots.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	227
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	228 The only time a name with a dot can occur is when
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	229 we are compiling an import statement that has a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	230 package name.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	231
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	232 TODO(jhylton): Decide whether we want to support
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	233 mangling of the module name, e.g. __M.X.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	234 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	235 if ((PyUnicode_READ_CHAR(ident, nlen-1) == '_' &&
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	236 PyUnicode_READ_CHAR(ident, nlen-2) == '_') \|\|
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	237 PyUnicode_FindChar(ident, '.', 0, nlen, 1) != -1) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	238 Py_INCREF(ident);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	239 return ident; /* Don't mangle __whatever__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	240 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	241 /* Strip leading underscores from class name */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	242 ipriv = 0;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	243 while (PyUnicode_READ_CHAR(privateobj, ipriv) == '_')
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	244 ipriv++;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	245 if (ipriv == plen) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	246 Py_INCREF(ident);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	247 return ident; /* Don't mangle if class is just underscores */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	248 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	249 plen -= ipriv;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	250
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	251 assert(1 <= PY_SSIZE_T_MAX - nlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	252 assert(1 + nlen <= PY_SSIZE_T_MAX - plen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	253
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	254 maxchar = PyUnicode_MAX_CHAR_VALUE(ident);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	255 if (PyUnicode_MAX_CHAR_VALUE(privateobj) > maxchar)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	256 maxchar = PyUnicode_MAX_CHAR_VALUE(privateobj);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	257
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	258 result = PyUnicode_New(1 + nlen + plen, maxchar);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	259 if (!result)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	260 return 0;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	261 /* ident = "_" + priv[ipriv:] + ident # i.e. 1+plen+nlen bytes */
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	262 PyUnicode_WRITE(PyUnicode_KIND(result), PyUnicode_DATA(result), 0, '_');
72493 c4dcb68e0711 Check for PyUnicode_CopyCharacters() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	263 if (PyUnicode_CopyCharacters(result, 1, privateobj, ipriv, plen) < 0) {
c4dcb68e0711 Check for PyUnicode_CopyCharacters() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	264 Py_DECREF(result);
c4dcb68e0711 Check for PyUnicode_CopyCharacters() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	265 return NULL;
c4dcb68e0711 Check for PyUnicode_CopyCharacters() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	266 }
c4dcb68e0711 Check for PyUnicode_CopyCharacters() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	267 if (PyUnicode_CopyCharacters(result, plen+1, ident, 0, nlen) < 0) {
c4dcb68e0711 Check for PyUnicode_CopyCharacters() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	268 Py_DECREF(result);
c4dcb68e0711 Check for PyUnicode_CopyCharacters() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	269 return NULL;
c4dcb68e0711 Check for PyUnicode_CopyCharacters() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	270 }
76573 1439e2d1f490 Check newly created consistency using _PyUnicode_CheckConsistency(str, 1) Victor Stinner <victor.stinner@gmail.com> parents: 76383 diff changeset	271 assert(_PyUnicode_CheckConsistency(result, 1));
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	272 return result;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	273 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	276 compiler_init(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	277 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	278 memset(c, 0, sizeof(struct compiler));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	279
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	280 c->c_stack = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	281 if (!c->c_stack)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	282 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	283
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	284 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	285 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	286
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	287 PyCodeObject *
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	288 PyAST_CompileEx(mod_ty mod, const char filename, PyCompilerFlags flags,
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	289 int optimize, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	290 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	291 struct compiler c;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	292 PyCodeObject *co = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	293 PyCompilerFlags local_flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	294 int merged;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	295
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	296 if (!__doc__) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	297 __doc__ = PyUnicode_InternFromString("__doc__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	298 if (!__doc__)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	299 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	300 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	301
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	302 if (!compiler_init(&c))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	303 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	304 c.c_filename = filename;
70435 27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	305 c.c_filename_obj = PyUnicode_DecodeFSDefault(filename);
27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	306 if (!c.c_filename_obj)
27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	307 goto finally;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	308 c.c_arena = arena;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	309 c.c_future = PyFuture_FromAST(mod, filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	310 if (c.c_future == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	311 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	312 if (!flags) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	313 local_flags.cf_flags = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	314 flags = &local_flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	315 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	316 merged = c.c_future->ff_features \| flags->cf_flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	317 c.c_future->ff_features = merged;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	318 flags->cf_flags = merged;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	319 c.c_flags = flags;
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	320 c.c_optimize = (optimize == -1) ? Py_OptimizeFlag : optimize;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	321 c.c_nestlevel = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	322
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	323 c.c_st = PySymtable_Build(mod, filename, c.c_future);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	324 if (c.c_st == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	325 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	326 PyErr_SetString(PyExc_SystemError, "no symtable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	327 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	328 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	329
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	330 co = compiler_mod(&c, mod);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	331
36697 78de5f6b2f67 Clarify C-style exception handling with proper label name. Thomas Wouters <thomas@python.org> parents: 36696 diff changeset	332 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	333 compiler_free(&c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	334 assert(co \|\| PyErr_Occurred());
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	335 return co;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	336 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	337
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	338 PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	339 PyNode_Compile(struct _node n, const char filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	340 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	341 PyCodeObject *co = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	342 mod_ty mod;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	343 PyArena *arena = PyArena_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	344 if (!arena)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	345 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	346 mod = PyAST_FromNode(n, NULL, filename, arena);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	347 if (mod)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	348 co = PyAST_Compile(mod, filename, NULL, arena);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	349 PyArena_Free(arena);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	350 return co;
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	351 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23589 diff changeset	352
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	353 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	354 compiler_free(struct compiler *c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	355 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	356 if (c->c_st)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	357 PySymtable_Free(c->c_st);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	358 if (c->c_future)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	359 PyObject_Free(c->c_future);
70435 27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	360 if (c->c_filename_obj)
27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	361 Py_DECREF(c->c_filename_obj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	362 Py_DECREF(c->c_stack);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	363 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	364
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	365 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	366 list2dict(PyObject *list)
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	367 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	368 Py_ssize_t i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	369 PyObject v, k;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	370 PyObject *dict = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	371 if (!dict) return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	372
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	373 n = PyList_Size(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	374 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	375 v = PyLong_FromLong(i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	376 if (!v) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	377 Py_DECREF(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	378 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	379 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	380 k = PyList_GET_ITEM(list, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	381 k = PyTuple_Pack(2, k, k->ob_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	382 if (k == NULL \|\| PyDict_SetItem(dict, k, v) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	383 Py_XDECREF(k);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	384 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	385 Py_DECREF(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	386 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	387 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	388 Py_DECREF(k);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	389 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	390 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	391 return dict;
1399 cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	392 }
cc172ce05561 Added compare operations for functions and code objects. Guido van Rossum <guido@python.org> parents: 1369 diff changeset	393
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	394 /* 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	395
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	396 src is a symbol table dictionary. If the scope of a name matches
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	397 either scope_type or flag is set, insert it into the new dict. The
36766 1daa199b784b Tabify and reflow some long lines. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36729 diff changeset	398 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	399 each key.
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	402 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	403 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	404 {
78171 1577e66a6642 remove unused variable Meador Inge <meadori@gmail.com> parents: 78167 diff changeset	405 Py_ssize_t i = offset, scope, num_keys, key_i;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	406 PyObject k, v, *dest = PyDict_New();
78164 79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	407 PyObject *sorted_keys;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	408
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	409 assert(offset >= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	410 if (dest == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	411 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	412
78164 79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	413 /* Sort the keys so that we have a deterministic order on the indexes
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	414 saved in the returned dictionary. These indexes are used as indexes
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	415 into the free and cell var storage. Therefore if they aren't
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	416 deterministic, then the generated bytecode is not deterministic.
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	417 */
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	418 sorted_keys = PyDict_Keys(src);
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	419 if (sorted_keys == NULL)
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	420 return NULL;
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	421 if (PyList_Sort(sorted_keys) != 0) {
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	422 Py_DECREF(sorted_keys);
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	423 return NULL;
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	424 }
78167 1c46f2ede4cb Issue #15368: fixing variable typo. Meador Inge <meadori@gmail.com> parents: 78164 diff changeset	425 num_keys = PyList_GET_SIZE(sorted_keys);
78164 79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	426
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	427 for (key_i = 0; key_i < num_keys; key_i++) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	428 /* XXX this should probably be a macro in symtable.h */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	429 long vi;
78164 79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	430 k = PyList_GET_ITEM(sorted_keys, key_i);
79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	431 v = PyDict_GetItem(src, k);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	432 assert(PyLong_Check(v));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	433 vi = PyLong_AS_LONG(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	434 scope = (vi >> SCOPE_OFFSET) & SCOPE_MASK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	435
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	436 if (scope == scope_type \|\| vi & flag) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	437 PyObject tuple, item = PyLong_FromLong(i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	438 if (item == NULL) {
78164 79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	439 Py_DECREF(sorted_keys);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	440 Py_DECREF(dest);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	441 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	442 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	443 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	444 tuple = PyTuple_Pack(2, k, k->ob_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	445 if (!tuple \|\| PyDict_SetItem(dest, tuple, item) < 0) {
78164 79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	446 Py_DECREF(sorted_keys);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	447 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	448 Py_DECREF(dest);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	449 Py_XDECREF(tuple);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	450 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	451 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	452 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	453 Py_DECREF(tuple);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	454 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	455 }
78164 79d54fba49b3 Issue #15368: make bytecode generation deterministic. Meador Inge <meadori@gmail.com> parents: 76382 diff changeset	456 Py_DECREF(sorted_keys);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	457 return dest;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	458 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	459
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	460 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	461 compiler_unit_check(struct compiler_unit *u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	462 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	463 basicblock *block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	464 for (block = u->u_blocks; block != NULL; block = block->b_list) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	465 assert((void )block != (void )0xcbcbcbcb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	466 assert((void )block != (void )0xfbfbfbfb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	467 assert((void )block != (void )0xdbdbdbdb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	468 if (block->b_instr != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	469 assert(block->b_ialloc > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	470 assert(block->b_iused > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	471 assert(block->b_ialloc >= block->b_iused);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	472 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	473 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	474 assert (block->b_iused == 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	475 assert (block->b_ialloc == 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	476 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	477 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	478 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	479
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	480 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	481 compiler_unit_free(struct compiler_unit *u)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	482 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	483 basicblock b, next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	484
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	485 compiler_unit_check(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	486 b = u->u_blocks;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	487 while (b != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	488 if (b->b_instr)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	489 PyObject_Free((void *)b->b_instr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	490 next = b->b_list;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	491 PyObject_Free((void *)b);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	492 b = next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	493 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	494 Py_CLEAR(u->u_ste);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	495 Py_CLEAR(u->u_name);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	496 Py_CLEAR(u->u_qualname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	497 Py_CLEAR(u->u_consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	498 Py_CLEAR(u->u_names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	499 Py_CLEAR(u->u_varnames);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	500 Py_CLEAR(u->u_freevars);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	501 Py_CLEAR(u->u_cellvars);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	502 Py_CLEAR(u->u_private);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	503 PyObject_Free(u);
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	506 static int
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	507 compiler_enter_scope(struct compiler *c, identifier name,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	508 int scope_type, void *key, int lineno)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	509 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	510 struct compiler_unit *u;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	511
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	512 u = (struct compiler_unit *)PyObject_Malloc(sizeof(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	513 struct compiler_unit));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	514 if (!u) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	515 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	516 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	517 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	518 memset(u, 0, sizeof(struct compiler_unit));
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	519 u->u_scope_type = scope_type;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	520 u->u_argcount = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	521 u->u_kwonlyargcount = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	522 u->u_ste = PySymtable_Lookup(c->c_st, key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	523 if (!u->u_ste) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	524 compiler_unit_free(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	525 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	526 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	527 Py_INCREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	528 u->u_name = name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	529 u->u_varnames = list2dict(u->u_ste->ste_varnames);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	530 u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	531 if (!u->u_varnames \|\| !u->u_cellvars) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	532 compiler_unit_free(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	533 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	534 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	535
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	536 u->u_freevars = dictbytype(u->u_ste->ste_symbols, FREE, DEF_FREE_CLASS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	537 PyDict_Size(u->u_cellvars));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	538 if (!u->u_freevars) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	539 compiler_unit_free(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	540 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	541 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	542
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	543 u->u_blocks = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	544 u->u_nfblocks = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	545 u->u_firstlineno = lineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	546 u->u_lineno = 0;
64861 861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64620 diff changeset	547 u->u_col_offset = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	548 u->u_lineno_set = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	549 u->u_consts = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	550 if (!u->u_consts) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	551 compiler_unit_free(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	552 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	553 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	554 u->u_names = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	555 if (!u->u_names) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	556 compiler_unit_free(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	557 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	558 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	559
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	560 u->u_private = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	561
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	562 /* Push the old compiler_unit on the stack. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	563 if (c->u) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	564 PyObject *capsule = PyCapsule_New(c->u, COMPILER_CAPSULE_NAME_COMPILER_UNIT, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	565 if (!capsule \|\| PyList_Append(c->c_stack, capsule) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	566 Py_XDECREF(capsule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	567 compiler_unit_free(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	568 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	569 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	570 Py_DECREF(capsule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	571 u->u_private = c->u->u_private;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	572 Py_XINCREF(u->u_private);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	573 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	574 c->u = u;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	575
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	576 c->c_nestlevel++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	577 if (compiler_use_new_block(c) == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	578 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	579
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	580 return 1;
35742 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
35797 3778083fe2c8 Ensure that compiler_exit_scope() is called as necessary to free memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35790 diff changeset	583 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	584 compiler_exit_scope(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	585 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	586 int n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	587 PyObject *capsule;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	588
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	589 c->c_nestlevel--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	590 compiler_unit_free(c->u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	591 /* Restore c->u to the parent unit. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	592 n = PyList_GET_SIZE(c->c_stack) - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	593 if (n >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	594 capsule = PyList_GET_ITEM(c->c_stack, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	595 c->u = (struct compiler_unit *)PyCapsule_GetPointer(capsule, COMPILER_CAPSULE_NAME_COMPILER_UNIT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	596 assert(c->u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	597 /* we are deleting from a list so this really shouldn't fail */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	598 if (PySequence_DelItem(c->c_stack, n) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	599 Py_FatalError("compiler_exit_scope()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	600 compiler_unit_check(c->u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	601 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	602 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	603 c->u = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	604
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	605 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	606
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	607 static PyObject *
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	608 compiler_scope_qualname(struct compiler *c)
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	609 {
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	610 Py_ssize_t stack_size, i;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	611 _Py_static_string(dot, ".");
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	612 _Py_static_string(locals, "<locals>");
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	613 struct compiler_unit *u;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	614 PyObject capsule, name, seq, dot_str, *locals_str;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	615
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	616 u = c->u;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	617 if (u->u_qualname != NULL) {
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	618 Py_INCREF(u->u_qualname);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	619 return u->u_qualname;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	620 }
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	621
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	622 seq = PyList_New(0);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	623 if (seq == NULL)
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	624 return NULL;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	625
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	626 stack_size = PyList_GET_SIZE(c->c_stack);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	627 for (i = 0; i < stack_size; i++) {
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	628 capsule = PyList_GET_ITEM(c->c_stack, i);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	629 u = (struct compiler_unit *)PyCapsule_GetPointer(capsule, COMPILER_CAPSULE_NAME_COMPILER_UNIT);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	630 assert(u);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	631 if (u->u_scope_type == COMPILER_SCOPE_MODULE)
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	632 continue;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	633 if (PyList_Append(seq, u->u_name))
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	634 goto _error;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	635 if (u->u_scope_type == COMPILER_SCOPE_FUNCTION) {
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	636 locals_str = _PyUnicode_FromId(&locals);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	637 if (locals_str == NULL)
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	638 goto _error;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	639 if (PyList_Append(seq, locals_str))
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	640 goto _error;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	641 }
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	642 }
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	643 u = c->u;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	644 if (PyList_Append(seq, u->u_name))
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	645 goto _error;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	646 dot_str = _PyUnicode_FromId(&dot);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	647 if (dot_str == NULL)
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	648 goto _error;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	649 name = PyUnicode_Join(dot_str, seq);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	650 Py_DECREF(seq);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	651 u->u_qualname = name;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	652 Py_XINCREF(name);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	653 return name;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	654
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	655 _error:
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	656 Py_XDECREF(seq);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	657 return NULL;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	658 }
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	659
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	660 /* 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	661 Returns NULL on error.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	662 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	663
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	664 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	665 compiler_new_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	666 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	667 basicblock *b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	668 struct compiler_unit *u;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	669
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	670 u = c->u;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	671 b = (basicblock *)PyObject_Malloc(sizeof(basicblock));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	672 if (b == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	673 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	674 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	675 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	676 memset((void *)b, 0, sizeof(basicblock));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	677 /* Extend the singly linked list of blocks with new block. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	678 b->b_list = u->u_blocks;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	679 u->u_blocks = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	680 return b;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	681 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	682
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	683 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	684 compiler_use_new_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	685 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	686 basicblock *block = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	687 if (block == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	688 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	689 c->u->u_curblock = block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	690 return block;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	691 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	692
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	693 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	694 compiler_next_block(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	695 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	696 basicblock *block = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	697 if (block == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	698 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	699 c->u->u_curblock->b_next = block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	700 c->u->u_curblock = block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	701 return block;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	702 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	703
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	704 static basicblock *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	705 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	706 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	707 assert(block != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	708 c->u->u_curblock->b_next = block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	709 c->u->u_curblock = block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	710 return block;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	711 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	712
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	713 /* 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	714 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	715 Returns -1 on failure.
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	716 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	717
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	718 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	719 compiler_next_instr(struct compiler c, basicblock b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	720 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	721 assert(b != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	722 if (b->b_instr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	723 b->b_instr = (struct instr *)PyObject_Malloc(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	724 sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	725 if (b->b_instr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	726 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	727 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	728 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	729 b->b_ialloc = DEFAULT_BLOCK_SIZE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	730 memset((char *)b->b_instr, 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	731 sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	732 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	733 else if (b->b_iused == b->b_ialloc) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	734 struct instr *tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	735 size_t oldsize, newsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	736 oldsize = b->b_ialloc * sizeof(struct instr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	737 newsize = oldsize << 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	738
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	739 if (oldsize > (PY_SIZE_MAX >> 1)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	740 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	741 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	742 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	743
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	744 if (newsize == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	745 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	746 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	747 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	748 b->b_ialloc <<= 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	749 tmp = (struct instr *)PyObject_Realloc(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	750 (void *)b->b_instr, newsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	751 if (tmp == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	752 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	753 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	754 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	755 b->b_instr = tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	756 memset((char *)b->b_instr + oldsize, 0, newsize - oldsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	757 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	758 return b->b_iused++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	759 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	760
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45082 diff changeset	761 /* Set the i_lineno member of the instruction at offset off if the
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45082 diff changeset	762 line number for the current expression/statement has not
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	763 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	764
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45082 diff changeset	765 The line number is reset in the following cases:
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45082 diff changeset	766 - when entering a new scope
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45082 diff changeset	767 - on each statement
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45082 diff changeset	768 - on each expression that start a new line
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45082 diff changeset	769 - before the "except" clause
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45082 diff changeset	770 - before the "for" and "while" expressions
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	771 */
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	772
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	773 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	774 compiler_set_lineno(struct compiler *c, int off)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	775 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	776 basicblock *b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	777 if (c->u->u_lineno_set)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	778 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	779 c->u->u_lineno_set = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	780 b = c->u->u_curblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	781 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	782 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	783
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	784 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	785 opcode_stack_effect(int opcode, int oparg)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	786 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	787 switch (opcode) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	788 case POP_TOP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	789 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	790 case ROT_TWO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	791 case ROT_THREE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	792 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	793 case DUP_TOP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	794 return 1;
64439 725231211273 Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced Antoine Pitrou <solipsis@pitrou.net> parents: 63114 diff changeset	795 case DUP_TOP_TWO:
725231211273 Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced Antoine Pitrou <solipsis@pitrou.net> parents: 63114 diff changeset	796 return 2;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	797
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	798 case UNARY_POSITIVE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	799 case UNARY_NEGATIVE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	800 case UNARY_NOT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	801 case UNARY_INVERT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	802 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	803
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	804 case SET_ADD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	805 case LIST_APPEND:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	806 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	807 case MAP_ADD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	808 return -2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	809
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	810 case BINARY_POWER:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	811 case BINARY_MULTIPLY:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	812 case BINARY_MODULO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	813 case BINARY_ADD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	814 case BINARY_SUBTRACT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	815 case BINARY_SUBSCR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	816 case BINARY_FLOOR_DIVIDE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	817 case BINARY_TRUE_DIVIDE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	818 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	819 case INPLACE_FLOOR_DIVIDE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	820 case INPLACE_TRUE_DIVIDE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	821 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	822
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	823 case INPLACE_ADD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	824 case INPLACE_SUBTRACT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	825 case INPLACE_MULTIPLY:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	826 case INPLACE_MODULO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	827 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	828 case STORE_SUBSCR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	829 return -3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	830 case STORE_MAP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	831 return -2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	832 case DELETE_SUBSCR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	833 return -2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	834
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	835 case BINARY_LSHIFT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	836 case BINARY_RSHIFT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	837 case BINARY_AND:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	838 case BINARY_XOR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	839 case BINARY_OR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	840 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	841 case INPLACE_POWER:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	842 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	843 case GET_ITER:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	844 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	845
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	846 case PRINT_EXPR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	847 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	848 case LOAD_BUILD_CLASS:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	849 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	850 case INPLACE_LSHIFT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	851 case INPLACE_RSHIFT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	852 case INPLACE_AND:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	853 case INPLACE_XOR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	854 case INPLACE_OR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	855 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	856 case BREAK_LOOP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	857 return 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	858 case SETUP_WITH:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	859 return 7;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	860 case WITH_CLEANUP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	861 return -1; /* XXX Sometimes more */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	862 case STORE_LOCALS:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	863 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	864 case RETURN_VALUE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	865 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	866 case IMPORT_STAR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	867 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	868 case YIELD_VALUE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	869 return 0;
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73738 diff changeset	870 case YIELD_FROM:
75714 72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230) Benjamin Peterson <benjamin@python.org> parents: 74391 diff changeset	871 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	872 case POP_BLOCK:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	873 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	874 case POP_EXCEPT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	875 return 0; /* -3 except if bad bytecode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	876 case END_FINALLY:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	877 return -1; /* or -2 or -3 if exception occurred */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	878
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	879 case STORE_NAME:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	880 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	881 case DELETE_NAME:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	882 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	883 case UNPACK_SEQUENCE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	884 return oparg-1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	885 case UNPACK_EX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	886 return (oparg&0xFF) + (oparg>>8);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	887 case FOR_ITER:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	888 return 1; /* or -1, at end of iterator */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	889
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	890 case STORE_ATTR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	891 return -2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	892 case DELETE_ATTR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	893 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	894 case STORE_GLOBAL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	895 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	896 case DELETE_GLOBAL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	897 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	898 case LOAD_CONST:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	899 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	900 case LOAD_NAME:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	901 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	902 case BUILD_TUPLE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	903 case BUILD_LIST:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	904 case BUILD_SET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	905 return 1-oparg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	906 case BUILD_MAP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	907 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	908 case LOAD_ATTR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	909 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	910 case COMPARE_OP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	911 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	912 case IMPORT_NAME:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	913 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	914 case IMPORT_FROM:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	915 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	916
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	917 case JUMP_FORWARD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	918 case JUMP_IF_TRUE_OR_POP: /* -1 if jump not taken */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	919 case JUMP_IF_FALSE_OR_POP: /* "" */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	920 case JUMP_ABSOLUTE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	921 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	922
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	923 case POP_JUMP_IF_FALSE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	924 case POP_JUMP_IF_TRUE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	925 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	926
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	927 case LOAD_GLOBAL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	928 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	929
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	930 case CONTINUE_LOOP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	931 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	932 case SETUP_LOOP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	933 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	934 case SETUP_EXCEPT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	935 case SETUP_FINALLY:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	936 return 6; /* can push 3 values for the new exception
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	937 + 3 others for the previous exception state */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	938
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	939 case LOAD_FAST:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	940 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	941 case STORE_FAST:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	942 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	943 case DELETE_FAST:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	944 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	945
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	946 case RAISE_VARARGS:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	947 return -oparg;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	948 #define NARGS(o) (((o) % 256) + 2*(((o) / 256) % 256))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	949 case CALL_FUNCTION:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	950 return -NARGS(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	951 case CALL_FUNCTION_VAR:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	952 case CALL_FUNCTION_KW:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	953 return -NARGS(oparg)-1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	954 case CALL_FUNCTION_VAR_KW:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	955 return -NARGS(oparg)-2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	956 case MAKE_FUNCTION:
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	957 return -1 -NARGS(oparg) - ((oparg >> 16) & 0xffff);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	958 case MAKE_CLOSURE:
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	959 return -2 - NARGS(oparg) - ((oparg >> 16) & 0xffff);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	960 #undef NARGS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	961 case BUILD_SLICE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	962 if (oparg == 3)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	963 return -2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	964 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	965 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	966
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	967 case LOAD_CLOSURE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	968 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	969 case LOAD_DEREF:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	970 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	971 case STORE_DEREF:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	972 return -1;
64620 25cc226dc9bd #4617: Previously it was illegal to delete a name from the local Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 64439 diff changeset	973 case DELETE_DEREF:
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 64439 diff changeset	974 return 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	975 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	976 fprintf(stderr, "opcode = %d\n", opcode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	977 Py_FatalError("opcode_stack_effect()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	978
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	979 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	980 return 0; /* not reachable */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	981 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	982
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	983 /* Add an opcode with no argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	984 Returns 0 on failure, 1 on success.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	985 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	986
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	987 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	988 compiler_addop(struct compiler *c, int opcode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	989 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	990 basicblock *b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	991 struct instr *i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	992 int off;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	993 off = compiler_next_instr(c, c->u->u_curblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	994 if (off < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	995 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	996 b = c->u->u_curblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	997 i = &b->b_instr[off];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	998 i->i_opcode = opcode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	999 i->i_hasarg = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1000 if (opcode == RETURN_VALUE)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1001 b->b_return = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1002 compiler_set_lineno(c, off);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1003 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1004 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1005
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1006 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1007 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	1008 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1009 PyObject t, v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1010 Py_ssize_t arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1011 double d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1012
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1013 /* necessary to make sure types aren't coerced (e.g., int and long) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1014 /* _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1015 if (PyFloat_Check(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1016 d = PyFloat_AS_DOUBLE(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1017 /* all we need is to make the tuple different in either the 0.0
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1018 * or -0.0 case from all others, just to avoid the "coercion".
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1019 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1020 if (d == 0.0 && copysign(1.0, d) < 0.0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1021 t = PyTuple_Pack(3, o, o->ob_type, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1022 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1023 t = PyTuple_Pack(2, o, o->ob_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1024 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1025 else if (PyComplex_Check(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1026 Py_complex z;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1027 int real_negzero, imag_negzero;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1028 /* For the complex case we must make complex(x, 0.)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1029 different from complex(x, -0.) and complex(0., y)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1030 different from complex(-0., y), for any x and y.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1031 All four complex zeros must be distinguished.*/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1032 z = PyComplex_AsCComplex(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1033 real_negzero = z.real == 0.0 && copysign(1.0, z.real) < 0.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1034 imag_negzero = z.imag == 0.0 && copysign(1.0, z.imag) < 0.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1035 if (real_negzero && imag_negzero) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1036 t = PyTuple_Pack(5, o, o->ob_type,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1037 Py_None, Py_None, Py_None);
45082 d7540031b959 Merged revisions 60475-60479,60481-60488 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1038 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1039 else if (imag_negzero) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1040 t = PyTuple_Pack(4, o, o->ob_type, Py_None, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1041 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1042 else if (real_negzero) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1043 t = PyTuple_Pack(3, o, o->ob_type, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1044 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1045 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1046 t = PyTuple_Pack(2, o, o->ob_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1047 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1048 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1049 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1050 t = PyTuple_Pack(2, o, o->ob_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1051 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1052 if (t == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1053 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1054
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1055 v = PyDict_GetItem(dict, t);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1056 if (!v) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1057 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1058 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1059 arg = PyDict_Size(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1060 v = PyLong_FromLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1061 if (!v) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1062 Py_DECREF(t);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1063 return -1;
42775 d7517c306791 Merged revisions 57221-57391 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1064 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1065 if (PyDict_SetItem(dict, t, v) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1066 Py_DECREF(t);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1067 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1068 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1069 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1070 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1071 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1072 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1073 arg = PyLong_AsLong(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1074 Py_DECREF(t);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1075 return arg;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1076 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1077
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1078 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1079 compiler_addop_o(struct compiler c, int opcode, PyObject dict,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1080 PyObject *o)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1081 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1082 int arg = compiler_add_o(c, dict, o);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1083 if (arg < 0)
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	1084 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1085 return compiler_addop_i(c, opcode, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1086 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1087
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1088 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1089 compiler_addop_name(struct compiler c, int opcode, PyObject dict,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1090 PyObject *o)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1091 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1092 int arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1093 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	1094 if (!mangled)
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	1095 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1096 arg = compiler_add_o(c, dict, mangled);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1097 Py_DECREF(mangled);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1098 if (arg < 0)
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	1099 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1100 return compiler_addop_i(c, opcode, arg);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1101 }
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 /* Add an opcode with an integer argument.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1104 Returns 0 on failure, 1 on success.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1105 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1106
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1107 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1108 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	1109 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1110 struct instr *i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1111 int off;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1112 off = compiler_next_instr(c, c->u->u_curblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1113 if (off < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1114 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1115 i = &c->u->u_curblock->b_instr[off];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1116 i->i_opcode = opcode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1117 i->i_oparg = oparg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1118 i->i_hasarg = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1119 compiler_set_lineno(c, off);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1120 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1121 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1122
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1123 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1124 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	1125 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1126 struct instr *i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1127 int off;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1128
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1129 assert(b != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1130 off = compiler_next_instr(c, c->u->u_curblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1131 if (off < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1132 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1133 i = &c->u->u_curblock->b_instr[off];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1134 i->i_opcode = opcode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1135 i->i_target = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1136 i->i_hasarg = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1137 if (absolute)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1138 i->i_jabs = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1139 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1140 i->i_jrel = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1141 compiler_set_lineno(c, off);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1142 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1143 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1144
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1145 /* The distinction between NEW_BLOCK and NEXT_BLOCK is subtle. (I'd
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1146 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	1147 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	1148 from the current block to the new block.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1149 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1150
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1151 /* 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	1152 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	1153 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1154
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1155
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1156 #define NEW_BLOCK(C) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1157 if (compiler_use_new_block((C)) == NULL) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1158 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1159 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1160
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1161 #define NEXT_BLOCK(C) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1162 if (compiler_next_block((C)) == NULL) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1163 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1164 }
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 #define ADDOP(C, OP) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1167 if (!compiler_addop((C), (OP))) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1168 return 0; \
35742 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
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1171 #define ADDOP_IN_SCOPE(C, OP) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1172 if (!compiler_addop((C), (OP))) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1173 compiler_exit_scope(c); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1174 return 0; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1175 } \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1176 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1177
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1178 #define ADDOP_O(C, OP, O, TYPE) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1179 if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1180 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1181 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1182
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1183 #define ADDOP_NAME(C, OP, O, TYPE) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1184 if (!compiler_addop_name((C), (OP), (C)->u->u_ ## TYPE, (O))) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1185 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1186 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1187
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1188 #define ADDOP_I(C, OP, O) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1189 if (!compiler_addop_i((C), (OP), (O))) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1190 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1191 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1192
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1193 #define ADDOP_JABS(C, OP, O) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1194 if (!compiler_addop_j((C), (OP), (O), 1)) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1195 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1196 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1197
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1198 #define ADDOP_JREL(C, OP, O) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1199 if (!compiler_addop_j((C), (OP), (O), 0)) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1200 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1201 }
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 /* 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	1204 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	1205 */
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 #define VISIT(C, TYPE, V) {\
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1208 if (!compiler_visit_ ## TYPE((C), (V))) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1209 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1210 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1211
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1212 #define VISIT_IN_SCOPE(C, TYPE, V) {\
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1213 if (!compiler_visit_ ## TYPE((C), (V))) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1214 compiler_exit_scope(c); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1215 return 0; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1216 } \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1217 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1218
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1219 #define VISIT_SLICE(C, V, CTX) {\
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1220 if (!compiler_visit_slice((C), (V), (CTX))) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1221 return 0; \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1222 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1223
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1224 #define VISIT_SEQ(C, TYPE, SEQ) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1225 int _i; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1226 asdl_seq seq = (SEQ); / avoid variable capture */ \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1227 for (_i = 0; _i < asdl_seq_LEN(seq); _i++) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1228 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, _i); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1229 if (!compiler_visit_ ## TYPE((C), elt)) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1230 return 0; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1231 } \
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1232 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1233
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1234 #define VISIT_SEQ_IN_SCOPE(C, TYPE, SEQ) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1235 int _i; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1236 asdl_seq seq = (SEQ); / avoid variable capture */ \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1237 for (_i = 0; _i < asdl_seq_LEN(seq); _i++) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1238 TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, _i); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1239 if (!compiler_visit_ ## TYPE((C), elt)) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1240 compiler_exit_scope(c); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1241 return 0; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1242 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1243 } \
35863 79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1244 }
79f2ce320192 Fix a lot of memory and ref leaks in error paths. Neal Norwitz <nnorwitz@gmail.com> parents: 35860 diff changeset	1245
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1246 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1247 compiler_isdocstring(stmt_ty s)
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 if (s->kind != Expr_kind)
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	1250 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1251 return s->v.Expr.value->kind == Str_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1252 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1253
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1254 /* 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	1255
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1256 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1257 compiler_body(struct compiler c, asdl_seq stmts)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1258 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1259 int i = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1260 stmt_ty st;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1261
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1262 if (!asdl_seq_LEN(stmts))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1263 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1264 st = (stmt_ty)asdl_seq_GET(stmts, 0);
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	1265 if (compiler_isdocstring(st) && c->c_optimize < 2) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1266 /* don't generate docstrings if -OO */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1267 i = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1268 VISIT(c, expr, st->v.Expr.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1269 if (!compiler_nameop(c, __doc__, Store))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1270 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1271 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1272 for (; i < asdl_seq_LEN(stmts); i++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1273 VISIT(c, stmt, (stmt_ty)asdl_seq_GET(stmts, i));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1274 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1275 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1276
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1277 static PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1278 compiler_mod(struct compiler *c, mod_ty mod)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1279 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1280 PyCodeObject *co;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1281 int addNone = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1282 static PyObject *module;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1283 if (!module) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1284 module = PyUnicode_InternFromString("<module>");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1285 if (!module)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1286 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1287 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1288 /* Use 0 for firstlineno initially, will fixup in assemble(). */
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1289 if (!compiler_enter_scope(c, module, COMPILER_SCOPE_MODULE, mod, 0))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1290 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1291 switch (mod->kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1292 case Module_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1293 if (!compiler_body(c, mod->v.Module.body)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1294 compiler_exit_scope(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1295 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1296 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1297 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1298 case Interactive_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1299 c->c_interactive = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1300 VISIT_SEQ_IN_SCOPE(c, stmt,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1301 mod->v.Interactive.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1302 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1303 case Expression_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1304 VISIT_IN_SCOPE(c, expr, mod->v.Expression.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1305 addNone = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1306 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1307 case Suite_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1308 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1309 "suite should not be possible");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1310 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1311 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1312 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1313 "module kind %d should not be possible",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1314 mod->kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1315 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1316 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1317 co = assemble(c, addNone);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1318 compiler_exit_scope(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1319 return co;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1320 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1321
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1322 /* 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	1323 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	1324 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	1325 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1326
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1327 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1328 get_ref_type(struct compiler c, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1329 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1330 int scope = PyST_GetScope(c->u->u_ste, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1331 if (scope == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1332 char buf[350];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1333 PyOS_snprintf(buf, sizeof(buf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1334 "unknown scope for %.100s in %.100s(%s) in %s\n"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1335 "symbols: %s\nlocals: %s\nglobals: %s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1336 PyBytes_AS_STRING(name),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1337 PyBytes_AS_STRING(c->u->u_name),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1338 PyObject_REPR(c->u->u_ste->ste_id),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1339 c->c_filename,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1340 PyObject_REPR(c->u->u_ste->ste_symbols),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1341 PyObject_REPR(c->u->u_varnames),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1342 PyObject_REPR(c->u->u_names)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1343 );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1344 Py_FatalError(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1345 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1346
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1347 return scope;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1348 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1349
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1350 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1351 compiler_lookup_arg(PyObject dict, PyObject name)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1352 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1353 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	1354 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	1355 if (k == NULL)
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	1356 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1357 v = PyDict_GetItem(dict, k);
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 35895 diff changeset	1358 Py_DECREF(k);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1359 if (v == NULL)
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	1360 return -1;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	1361 return PyLong_AS_LONG(v);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1362 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1363
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1364 static int
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1365 compiler_make_closure(struct compiler c, PyCodeObject co, int args, PyObject *qualname)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1366 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1367 int i, free = PyCode_GetNumFree(co);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1368 if (qualname == NULL)
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1369 qualname = co->co_name;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1370
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1371 if (free == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1372 ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1373 ADDOP_O(c, LOAD_CONST, qualname, consts);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1374 ADDOP_I(c, MAKE_FUNCTION, args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1375 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1376 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1377 for (i = 0; i < free; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1378 /* Bypass com_addop_varname because it will generate
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1379 LOAD_DEREF but LOAD_CLOSURE is needed.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1380 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1381 PyObject *name = PyTuple_GET_ITEM(co->co_freevars, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1382 int arg, reftype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1383
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1384 /* Special case: If a class contains a method with a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1385 free variable that has the same name as a method,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1386 the name will be considered free and local in the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1387 class. It should be handled by the closure, as
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1388 well as by the normal name loookup logic.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1389 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1390 reftype = get_ref_type(c, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1391 if (reftype == CELL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1392 arg = compiler_lookup_arg(c->u->u_cellvars, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1393 else /* (reftype == FREE) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1394 arg = compiler_lookup_arg(c->u->u_freevars, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1395 if (arg == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1396 fprintf(stderr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1397 "lookup %s in %s %d %d\n"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1398 "freevars of %s: %s\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1399 PyObject_REPR(name),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1400 PyBytes_AS_STRING(c->u->u_name),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1401 reftype, arg,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1402 _PyUnicode_AsString(co->co_name),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1403 PyObject_REPR(co->co_freevars));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1404 Py_FatalError("compiler_make_closure()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1405 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1406 ADDOP_I(c, LOAD_CLOSURE, arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1407 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1408 ADDOP_I(c, BUILD_TUPLE, free);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1409 ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1410 ADDOP_O(c, LOAD_CONST, qualname, consts);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1411 ADDOP_I(c, MAKE_CLOSURE, args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1412 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1413 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1414
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1415 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1416 compiler_decorators(struct compiler c, asdl_seq decos)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1417 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1418 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1419
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1420 if (!decos)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1421 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1422
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1423 for (i = 0; i < asdl_seq_LEN(decos); i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1424 VISIT(c, expr, (expr_ty)asdl_seq_GET(decos, i));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1425 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1426 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1427 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1428
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1429 static int
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1430 compiler_visit_kwonlydefaults(struct compiler c, asdl_seq kwonlyargs,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1431 asdl_seq *kw_defaults)
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1432 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1433 int i, default_count = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1434 for (i = 0; i < asdl_seq_LEN(kwonlyargs); i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1435 arg_ty arg = asdl_seq_GET(kwonlyargs, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1436 expr_ty default_ = asdl_seq_GET(kw_defaults, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1437 if (default_) {
76382 f8540b8d076c mangle keyword-only argname when loading defaults (closes #14607) Benjamin Peterson <benjamin@python.org> parents: 70444 diff changeset	1438 PyObject *mangled = _Py_Mangle(c->u->u_private, arg->arg);
f8540b8d076c mangle keyword-only argname when loading defaults (closes #14607) Benjamin Peterson <benjamin@python.org> parents: 70444 diff changeset	1439 if (!mangled)
f8540b8d076c mangle keyword-only argname when loading defaults (closes #14607) Benjamin Peterson <benjamin@python.org> parents: 70444 diff changeset	1440 return -1;
f8540b8d076c mangle keyword-only argname when loading defaults (closes #14607) Benjamin Peterson <benjamin@python.org> parents: 70444 diff changeset	1441 ADDOP_O(c, LOAD_CONST, mangled, consts);
f8540b8d076c mangle keyword-only argname when loading defaults (closes #14607) Benjamin Peterson <benjamin@python.org> parents: 70444 diff changeset	1442 Py_DECREF(mangled);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1443 if (!compiler_visit_expr(c, default_)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1444 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1445 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1446 default_count++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1447 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1448 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1449 return default_count;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1450 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1451
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1452 static int
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1453 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	1454 expr_ty annotation, PyObject *names)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1455 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1456 if (annotation) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1457 VISIT(c, expr, annotation);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1458 if (PyList_Append(names, id))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1459 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1460 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1461 return 0;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1462 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1463
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1464 static int
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1465 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	1466 PyObject *names)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1467 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1468 int i, error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1469 for (i = 0; i < asdl_seq_LEN(args); i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1470 arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1471 error = compiler_visit_argannotation(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1472 c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1473 arg->arg,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1474 arg->annotation,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1475 names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1476 if (error)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1477 return error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1478 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1479 return 0;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1480 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1481
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1482 static int
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1483 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	1484 expr_ty returns)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1485 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1486 /* Push arg annotations and a list of the argument names. Return the #
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1487 of items pushed. The expressions are evaluated out-of-order wrt the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1488 source code.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1489
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1490 More than 2^16-1 annotations is a SyntaxError. Returns -1 on error.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1491 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1492 static identifier return_str;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1493 PyObject *names;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1494 int len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1495 names = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1496 if (!names)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1497 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1498
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1499 if (compiler_visit_argannotations(c, args->args, names))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1500 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1501 if (args->varargannotation &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1502 compiler_visit_argannotation(c, args->vararg,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1503 args->varargannotation, names))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1504 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1505 if (compiler_visit_argannotations(c, args->kwonlyargs, names))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1506 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1507 if (args->kwargannotation &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1508 compiler_visit_argannotation(c, args->kwarg,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1509 args->kwargannotation, names))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1510 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1511
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1512 if (!return_str) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1513 return_str = PyUnicode_InternFromString("return");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1514 if (!return_str)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1515 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1516 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1517 if (compiler_visit_argannotation(c, return_str, returns, names)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1518 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1519 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1520
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1521 len = PyList_GET_SIZE(names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1522 if (len > 65534) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1523 /* len must fit in 16 bits, and len is incremented below */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1524 PyErr_SetString(PyExc_SyntaxError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1525 "too many annotations");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1526 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1527 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1528 if (len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1529 /* convert names to a tuple and place on stack */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1530 PyObject *elt;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1531 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1532 PyObject *s = PyTuple_New(len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1533 if (!s)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1534 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1535 for (i = 0; i < len; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1536 elt = PyList_GET_ITEM(names, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1537 Py_INCREF(elt);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1538 PyTuple_SET_ITEM(s, i, elt);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1539 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1540 ADDOP_O(c, LOAD_CONST, s, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1541 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1542 len++; /* include the just-pushed tuple */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1543 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1544 Py_DECREF(names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1545 return len;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1546
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1547 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1548 Py_DECREF(names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1549 return -1;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1550 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1551
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1552 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1553 compiler_function(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1554 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1555 PyCodeObject *co;
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1556 PyObject qualname, first_const = Py_None;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1557 arguments_ty args = s->v.FunctionDef.args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1558 expr_ty returns = s->v.FunctionDef.returns;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1559 asdl_seq* decos = s->v.FunctionDef.decorator_list;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1560 stmt_ty st;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1561 int i, n, docstring, kw_default_count = 0, arglength;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1562 int num_annotations;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1563
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1564 assert(s->kind == FunctionDef_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1565
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1566 if (!compiler_decorators(c, decos))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1567 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1568 if (args->kwonlyargs) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1569 int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1570 args->kw_defaults);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1571 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1572 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1573 kw_default_count = res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1574 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1575 if (args->defaults)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1576 VISIT_SEQ(c, expr, args->defaults);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1577 num_annotations = compiler_visit_annotations(c, args, returns);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1578 if (num_annotations < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1579 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1580 assert((num_annotations & 0xFFFF) == num_annotations);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1581
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1582 if (!compiler_enter_scope(c, s->v.FunctionDef.name,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1583 COMPILER_SCOPE_FUNCTION, (void *)s,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1584 s->lineno))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1585 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1586
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1587 st = (stmt_ty)asdl_seq_GET(s->v.FunctionDef.body, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1588 docstring = compiler_isdocstring(st);
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	1589 if (docstring && c->c_optimize < 2)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1590 first_const = st->v.Expr.value->v.Str.s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1591 if (compiler_add_o(c, c->u->u_consts, first_const) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1592 compiler_exit_scope(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1593 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1594 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1595
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1596 c->u->u_argcount = asdl_seq_LEN(args->args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1597 c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1598 n = asdl_seq_LEN(s->v.FunctionDef.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1599 /* if there was a docstring, we need to skip the first statement */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1600 for (i = docstring; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1601 st = (stmt_ty)asdl_seq_GET(s->v.FunctionDef.body, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1602 VISIT_IN_SCOPE(c, stmt, st);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1603 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1604 co = assemble(c, 1);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1605 qualname = compiler_scope_qualname(c);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1606 compiler_exit_scope(c);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1607 if (qualname == NULL \|\| co == NULL) {
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1608 Py_XDECREF(qualname);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1609 Py_XDECREF(co);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1610 return 0;
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1611 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1612
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1613 arglength = asdl_seq_LEN(args->defaults);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1614 arglength \|= kw_default_count << 8;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1615 arglength \|= num_annotations << 16;
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1616 compiler_make_closure(c, co, arglength, qualname);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1617 Py_DECREF(qualname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1618 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1619
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1620 /* decorators */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1621 for (i = 0; i < asdl_seq_LEN(decos); i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1622 ADDOP_I(c, CALL_FUNCTION, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1623 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1624
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1625 return compiler_nameop(c, s->v.FunctionDef.name, Store);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1626 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1627
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1628 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1629 compiler_class(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1630 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1631 PyCodeObject *co;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1632 PyObject *str;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1633 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1634 asdl_seq* decos = s->v.ClassDef.decorator_list;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1635
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1636 if (!compiler_decorators(c, decos))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1637 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1638
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1639 /* ultimately generate code for:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1640 <name> = __build_class__(<func>, <name>, <bases>, *<keywords>)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1641 where:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1642 <func> is a function/closure created from the class body;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1643 it has a single argument (__locals__) where the dict
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1644 (or MutableSequence) representing the locals is passed
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1645 <name> is the class name
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1646 <bases> is the positional arguments and *varargs argument
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1647 <keywords> is the keyword arguments and **kwds argument
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1648 This borrows from compiler_call.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1649 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1650
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1651 /* 1. compile the class body into a code object */
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1652 if (!compiler_enter_scope(c, s->v.ClassDef.name,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1653 COMPILER_SCOPE_CLASS, (void *)s, s->lineno))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1654 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1655 /* this block represents what we do in the new scope */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1656 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1657 /* use the class name for name mangling */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1658 Py_INCREF(s->v.ClassDef.name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1659 Py_XDECREF(c->u->u_private);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1660 c->u->u_private = s->v.ClassDef.name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1661 /* force it to have one mandatory argument */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1662 c->u->u_argcount = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1663 /* load the first argument (__locals__) ... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1664 ADDOP_I(c, LOAD_FAST, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1665 /* ... and store it into f_locals */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1666 ADDOP_IN_SCOPE(c, STORE_LOCALS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1667 /* load (global) __name__ ... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1668 str = PyUnicode_InternFromString("__name__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1669 if (!str \|\| !compiler_nameop(c, str, Load)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1670 Py_XDECREF(str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1671 compiler_exit_scope(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1672 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1673 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1674 Py_DECREF(str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1675 /* ... and store it as __module__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1676 str = PyUnicode_InternFromString("__module__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1677 if (!str \|\| !compiler_nameop(c, str, Store)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1678 Py_XDECREF(str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1679 compiler_exit_scope(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1680 return 0;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1681 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1682 Py_DECREF(str);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1683 /* store the __qualname__ */
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1684 str = compiler_scope_qualname(c);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1685 if (!str) {
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1686 compiler_exit_scope(c);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1687 return 0;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1688 }
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1689 ADDOP_O(c, LOAD_CONST, str, consts);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1690 Py_DECREF(str);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1691 str = PyUnicode_InternFromString("__qualname__");
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1692 if (!str \|\| !compiler_nameop(c, str, Store)) {
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1693 Py_XDECREF(str);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1694 compiler_exit_scope(c);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1695 return 0;
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1696 }
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1697 Py_DECREF(str);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1698 /* compile the body proper */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1699 if (!compiler_body(c, s->v.ClassDef.body)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1700 compiler_exit_scope(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1701 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1702 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1703 /* return the (empty) __class__ cell */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1704 str = PyUnicode_InternFromString("__class__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1705 if (str == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1706 compiler_exit_scope(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1707 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1708 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1709 i = compiler_lookup_arg(c->u->u_cellvars, str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1710 Py_DECREF(str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1711 if (i == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1712 /* This happens when nobody references the cell */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1713 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1714 /* Return None */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1715 ADDOP_O(c, LOAD_CONST, Py_None, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1716 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1717 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1718 /* Return the cell where to store __class__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1719 ADDOP_I(c, LOAD_CLOSURE, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1720 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1721 ADDOP_IN_SCOPE(c, RETURN_VALUE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1722 /* create the code object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1723 co = assemble(c, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1724 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1725 /* leave the new scope */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1726 compiler_exit_scope(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1727 if (co == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1728 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1729
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1730 /* 2. load the 'build_class' function */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1731 ADDOP(c, LOAD_BUILD_CLASS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1732
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1733 /* 3. load a function (or closure) made from the code object */
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1734 compiler_make_closure(c, co, 0, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1735 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1736
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1737 /* 4. load class name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1738 ADDOP_O(c, LOAD_CONST, s->v.ClassDef.name, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1739
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1740 /* 5. generate the rest of the code for the call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1741 if (!compiler_call_helper(c, 2,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1742 s->v.ClassDef.bases,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1743 s->v.ClassDef.keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1744 s->v.ClassDef.starargs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1745 s->v.ClassDef.kwargs))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1746 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1747
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1748 /* 6. apply decorators */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1749 for (i = 0; i < asdl_seq_LEN(decos); i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1750 ADDOP_I(c, CALL_FUNCTION, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1751 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1752
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1753 /* 7. store into <name> */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1754 if (!compiler_nameop(c, s->v.ClassDef.name, Store))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1755 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1756 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1757 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1758
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1759 static int
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1760 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	1761 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1762 basicblock end, next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1763
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1764 assert(e->kind == IfExp_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1765 end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1766 if (end == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1767 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1768 next = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1769 if (next == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1770 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1771 VISIT(c, expr, e->v.IfExp.test);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1772 ADDOP_JABS(c, POP_JUMP_IF_FALSE, next);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1773 VISIT(c, expr, e->v.IfExp.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1774 ADDOP_JREL(c, JUMP_FORWARD, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1775 compiler_use_next_block(c, next);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1776 VISIT(c, expr, e->v.IfExp.orelse);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1777 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1778 return 1;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1779 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1780
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1781 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1782 compiler_lambda(struct compiler *c, expr_ty e)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1783 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1784 PyCodeObject *co;
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1785 PyObject *qualname;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1786 static identifier name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1787 int kw_default_count = 0, arglength;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1788 arguments_ty args = e->v.Lambda.args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1789 assert(e->kind == Lambda_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1790
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1791 if (!name) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1792 name = PyUnicode_InternFromString("<lambda>");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1793 if (!name)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1794 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1795 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1796
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1797 if (args->kwonlyargs) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1798 int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1799 args->kw_defaults);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1800 if (res < 0) return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1801 kw_default_count = res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1802 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1803 if (args->defaults)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1804 VISIT_SEQ(c, expr, args->defaults);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1805 if (!compiler_enter_scope(c, name, COMPILER_SCOPE_FUNCTION,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1806 (void *)e, e->lineno))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1807 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1808
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	1809 /* Make None the first constant, so the lambda can't have a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	1810 docstring. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	1811 if (compiler_add_o(c, c->u->u_consts, Py_None) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	1812 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	1813
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1814 c->u->u_argcount = asdl_seq_LEN(args->args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1815 c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1816 VISIT_IN_SCOPE(c, expr, e->v.Lambda.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1817 if (c->u->u_ste->ste_generator) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1818 ADDOP_IN_SCOPE(c, POP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1819 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1820 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1821 ADDOP_IN_SCOPE(c, RETURN_VALUE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1822 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1823 co = assemble(c, 1);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1824 qualname = compiler_scope_qualname(c);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1825 compiler_exit_scope(c);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1826 if (qualname == NULL \|\| co == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1827 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1828
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1829 arglength = asdl_seq_LEN(args->defaults);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1830 arglength \|= kw_default_count << 8;
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1831 compiler_make_closure(c, co, arglength, qualname);
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	1832 Py_DECREF(qualname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1833 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1834
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1835 return 1;
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1838 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1839 compiler_if(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1840 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1841 basicblock end, next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1842 int constant;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1843 assert(s->kind == If_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1844 end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1845 if (end == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1846 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1847
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	1848 constant = expr_constant(c, s->v.If.test);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1849 /* constant = 0: "if 0"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1850 * constant = 1: "if 1", "if 2", ...
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1851 * constant = -1: rest */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1852 if (constant == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1853 if (s->v.If.orelse)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1854 VISIT_SEQ(c, stmt, s->v.If.orelse);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1855 } else if (constant == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1856 VISIT_SEQ(c, stmt, s->v.If.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1857 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1858 if (s->v.If.orelse) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1859 next = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1860 if (next == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1861 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1862 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1863 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1864 next = end;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1865 VISIT(c, expr, s->v.If.test);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1866 ADDOP_JABS(c, POP_JUMP_IF_FALSE, next);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1867 VISIT_SEQ(c, stmt, s->v.If.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1868 ADDOP_JREL(c, JUMP_FORWARD, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1869 if (s->v.If.orelse) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1870 compiler_use_next_block(c, next);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1871 VISIT_SEQ(c, stmt, s->v.If.orelse);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1872 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1873 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1874 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1875 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1876 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1877
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1878 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1879 compiler_for(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1880 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1881 basicblock start, cleanup, *end;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1882
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1883 start = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1884 cleanup = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1885 end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1886 if (start == NULL \|\| end == NULL \|\| cleanup == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1887 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1888 ADDOP_JREL(c, SETUP_LOOP, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1889 if (!compiler_push_fblock(c, LOOP, start))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1890 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1891 VISIT(c, expr, s->v.For.iter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1892 ADDOP(c, GET_ITER);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1893 compiler_use_next_block(c, start);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1894 ADDOP_JREL(c, FOR_ITER, cleanup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1895 VISIT(c, expr, s->v.For.target);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1896 VISIT_SEQ(c, stmt, s->v.For.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1897 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1898 compiler_use_next_block(c, cleanup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1899 ADDOP(c, POP_BLOCK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1900 compiler_pop_fblock(c, LOOP, start);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1901 VISIT_SEQ(c, stmt, s->v.For.orelse);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1902 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1903 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1904 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1905
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1906 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1907 compiler_while(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1908 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1909 basicblock loop, orelse, end, anchor = NULL;
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	1910 int constant = expr_constant(c, s->v.While.test);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1911
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1912 if (constant == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1913 if (s->v.While.orelse)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1914 VISIT_SEQ(c, stmt, s->v.While.orelse);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1915 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1916 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1917 loop = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1918 end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1919 if (constant == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1920 anchor = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1921 if (anchor == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1922 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1923 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1924 if (loop == NULL \|\| end == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1925 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1926 if (s->v.While.orelse) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1927 orelse = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1928 if (orelse == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1929 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1930 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1931 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1932 orelse = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1933
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1934 ADDOP_JREL(c, SETUP_LOOP, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1935 compiler_use_next_block(c, loop);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1936 if (!compiler_push_fblock(c, LOOP, loop))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1937 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1938 if (constant == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1939 VISIT(c, expr, s->v.While.test);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1940 ADDOP_JABS(c, POP_JUMP_IF_FALSE, anchor);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1941 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1942 VISIT_SEQ(c, stmt, s->v.While.body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1943 ADDOP_JABS(c, JUMP_ABSOLUTE, loop);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1944
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1945 /* XXX should the two POP instructions be in a separate block
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1946 if there is no else clause ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1947 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1948
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1949 if (constant == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1950 compiler_use_next_block(c, anchor);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1951 ADDOP(c, POP_BLOCK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1952 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1953 compiler_pop_fblock(c, LOOP, loop);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1954 if (orelse != NULL) /* what if orelse is just pass? */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1955 VISIT_SEQ(c, stmt, s->v.While.orelse);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1956 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1957
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1958 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1959 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1960
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1961 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1962 compiler_continue(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1963 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1964 static const char LOOP_ERROR_MSG[] = "'continue' not properly in loop";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1965 static const char IN_FINALLY_ERROR_MSG[] =
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1966 "'continue' not supported inside 'finally' clause";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1967 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1968
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1969 if (!c->u->u_nfblocks)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1970 return compiler_error(c, LOOP_ERROR_MSG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1971 i = c->u->u_nfblocks - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1972 switch (c->u->u_fblock[i].fb_type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1973 case LOOP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1974 ADDOP_JABS(c, JUMP_ABSOLUTE, c->u->u_fblock[i].fb_block);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1975 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1976 case EXCEPT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1977 case FINALLY_TRY:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1978 while (--i >= 0 && c->u->u_fblock[i].fb_type != LOOP) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1979 /* Prevent continue anywhere under a finally
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1980 even if hidden in a sub-try or except. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1981 if (c->u->u_fblock[i].fb_type == FINALLY_END)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1982 return compiler_error(c, IN_FINALLY_ERROR_MSG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1983 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1984 if (i == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1985 return compiler_error(c, LOOP_ERROR_MSG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1986 ADDOP_JABS(c, CONTINUE_LOOP, c->u->u_fblock[i].fb_block);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1987 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1988 case FINALLY_END:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1989 return compiler_error(c, IN_FINALLY_ERROR_MSG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1990 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1991
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1992 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1993 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1994
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	1995 /* Code generated for "try: <body> finally: <finalbody>" is as follows:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1996
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1997 SETUP_FINALLY L
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1998 <code for body>
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	1999 POP_BLOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2000 LOAD_CONST <None>
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2001 L: <code for finalbody>
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2002 END_FINALLY
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2003
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2004 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	2005 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	2006 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	2007 block stack entry was created, and a label (here L).
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2008
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2009 SETUP_FINALLY:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2010 Pushes the current value stack level and the label
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2011 onto the block stack.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2012 POP_BLOCK:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2013 Pops en entry from the block stack, and pops the value
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2014 stack until its level is the same as indicated on the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2015 block stack. (The label is ignored.)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2016 END_FINALLY:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2017 Pops a variable number of entries from the value stack
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2018 and re-raises the exception they specify. The number of
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2019 entries popped depends on the (pseudo) exception type.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2020
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2021 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	2022 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	2023 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	2024 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	2025 stack.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2026 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2027
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2028 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2029 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	2030 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2031 basicblock body, end;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2032 body = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2033 end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2034 if (body == NULL \|\| end == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2035 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2036
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2037 ADDOP_JREL(c, SETUP_FINALLY, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2038 compiler_use_next_block(c, body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2039 if (!compiler_push_fblock(c, FINALLY_TRY, body))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2040 return 0;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2041 if (s->v.Try.handlers && asdl_seq_LEN(s->v.Try.handlers)) {
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2042 if (!compiler_try_except(c, s))
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2043 return 0;
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2044 }
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2045 else {
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2046 VISIT_SEQ(c, stmt, s->v.Try.body);
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2047 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2048 ADDOP(c, POP_BLOCK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2049 compiler_pop_fblock(c, FINALLY_TRY, body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2050
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2051 ADDOP_O(c, LOAD_CONST, Py_None, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2052 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2053 if (!compiler_push_fblock(c, FINALLY_END, end))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2054 return 0;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2055 VISIT_SEQ(c, stmt, s->v.Try.finalbody);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2056 ADDOP(c, END_FINALLY);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2057 compiler_pop_fblock(c, FINALLY_END, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2058
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2059 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2060 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2061
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2062 /*
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51382 diff changeset	2063 Code generated for "try: S except E1 as V1: S1 except E2 as V2: S2 ...":
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2064 (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	2065 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	2066 associated value, and 'exc' the exception.)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2067
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2068 Value stack Label Instruction Argument
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2069 [] SETUP_EXCEPT L1
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2070 [] <code for S>
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2071 [] POP_BLOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2072 [] JUMP_FORWARD L0
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2073
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2074 [tb, val, exc] L1: DUP )
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2075 [tb, val, exc, exc] <evaluate E1> )
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2076 [tb, val, exc, exc, E1] COMPARE_OP EXC_MATCH ) only if E1
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2077 [tb, val, exc, 1-or-0] POP_JUMP_IF_FALSE L2 )
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2078 [tb, val, exc] POP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2079 [tb, val] <assign to V1> (or POP if no V1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2080 [tb] POP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2081 [] <code for S1>
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2082 JUMP_FORWARD L0
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2083
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2084 [tb, val, exc] L2: DUP
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2085 .............................etc.......................
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2086
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2087 [tb, val, exc] Ln+1: END_FINALLY # re-raise exception
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2088
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2089 [] L0: <next statement>
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2090
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2091 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	2092 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2093 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2094 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	2095 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2096 basicblock body, orelse, except, end;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2097 int i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2098
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2099 body = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2100 except = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2101 orelse = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2102 end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2103 if (body == NULL \|\| except == NULL \|\| orelse == NULL \|\| end == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2104 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2105 ADDOP_JREL(c, SETUP_EXCEPT, except);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2106 compiler_use_next_block(c, body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2107 if (!compiler_push_fblock(c, EXCEPT, body))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2108 return 0;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2109 VISIT_SEQ(c, stmt, s->v.Try.body);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2110 ADDOP(c, POP_BLOCK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2111 compiler_pop_fblock(c, EXCEPT, body);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2112 ADDOP_JREL(c, JUMP_FORWARD, orelse);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2113 n = asdl_seq_LEN(s->v.Try.handlers);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2114 compiler_use_next_block(c, except);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2115 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2116 excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET(
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2117 s->v.Try.handlers, i);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2118 if (!handler->v.ExceptHandler.type && i < n-1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2119 return compiler_error(c, "default 'except:' must be last");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2120 c->u->u_lineno_set = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2121 c->u->u_lineno = handler->lineno;
64861 861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64620 diff changeset	2122 c->u->u_col_offset = handler->col_offset;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2123 except = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2124 if (except == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2125 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2126 if (handler->v.ExceptHandler.type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2127 ADDOP(c, DUP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2128 VISIT(c, expr, handler->v.ExceptHandler.type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2129 ADDOP_I(c, COMPARE_OP, PyCmp_EXC_MATCH);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2130 ADDOP_JABS(c, POP_JUMP_IF_FALSE, except);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2131 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2132 ADDOP(c, POP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2133 if (handler->v.ExceptHandler.name) {
70440 4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2134 basicblock cleanup_end, cleanup_body;
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2135
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2136 cleanup_end = compiler_new_block(c);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2137 cleanup_body = compiler_new_block(c);
70443 95117a2da450 fix spacing Benjamin Peterson <benjamin@python.org> parents: 70440 diff changeset	2138 if (!(cleanup_end \|\| cleanup_body))
70440 4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2139 return 0;
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2140
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2141 compiler_nameop(c, handler->v.ExceptHandler.name, Store);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2142 ADDOP(c, POP_TOP);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2143
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2144 /*
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2145 try:
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2146 # body
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2147 except type as name:
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2148 try:
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2149 # body
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2150 finally:
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2151 name = None
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2152 del name
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2153 */
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2154
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2155 /* second try: */
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2156 ADDOP_JREL(c, SETUP_FINALLY, cleanup_end);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2157 compiler_use_next_block(c, cleanup_body);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2158 if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2159 return 0;
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2160
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2161 /* second # body */
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2162 VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2163 ADDOP(c, POP_BLOCK);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2164 ADDOP(c, POP_EXCEPT);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2165 compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2166
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2167 /* finally: */
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2168 ADDOP_O(c, LOAD_CONST, Py_None, consts);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2169 compiler_use_next_block(c, cleanup_end);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2170 if (!compiler_push_fblock(c, FINALLY_END, cleanup_end))
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2171 return 0;
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2172
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2173 /* name = None */
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2174 ADDOP_O(c, LOAD_CONST, Py_None, consts);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2175 compiler_nameop(c, handler->v.ExceptHandler.name, Store);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2176
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2177 /* del name */
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2178 compiler_nameop(c, handler->v.ExceptHandler.name, Del);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2179
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2180 ADDOP(c, END_FINALLY);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2181 compiler_pop_fblock(c, FINALLY_END, cleanup_end);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2182 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2183 else {
70440 4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2184 basicblock *cleanup_body;
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2185
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2186 cleanup_body = compiler_new_block(c);
70443 95117a2da450 fix spacing Benjamin Peterson <benjamin@python.org> parents: 70440 diff changeset	2187 if (!cleanup_body)
70440 4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2188 return 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2189
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	2190 ADDOP(c, POP_TOP);
70440 4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2191 ADDOP(c, POP_TOP);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2192 compiler_use_next_block(c, cleanup_body);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2193 if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2194 return 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2195 VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
70440 4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2196 ADDOP(c, POP_EXCEPT);
4e472427315e fix indentation Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	2197 compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2198 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2199 ADDOP_JREL(c, JUMP_FORWARD, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2200 compiler_use_next_block(c, except);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2201 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2202 ADDOP(c, END_FINALLY);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2203 compiler_use_next_block(c, orelse);
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2204 VISIT_SEQ(c, stmt, s->v.Try.orelse);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2205 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2206 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2207 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2208
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2209 static int
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2210 compiler_try(struct compiler *c, stmt_ty s) {
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2211 if (s->v.Try.finalbody && asdl_seq_LEN(s->v.Try.finalbody))
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2212 return compiler_try_finally(c, s);
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2213 else
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2214 return compiler_try_except(c, s);
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2215 }
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2216
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2217
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2218 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2219 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	2220 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2221 /* The IMPORT_NAME opcode was already generated. This function
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2222 merely needs to bind the result to a name.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2223
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2224 If there is a dot in name, we need to split it and emit a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2225 LOAD_ATTR for each name.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2226 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2227 Py_ssize_t dot = PyUnicode_FindChar(name, '.', 0,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2228 PyUnicode_GET_LENGTH(name), 1);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2229 if (dot == -2)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2230 return -1;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2231 if (dot != -1) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2232 /* Consume the base module name to get the first attribute */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2233 Py_ssize_t pos = dot + 1;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2234 while (dot != -1) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2235 PyObject *attr;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2236 dot = PyUnicode_FindChar(name, '.', pos,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2237 PyUnicode_GET_LENGTH(name), 1);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2238 if (dot == -2)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2239 return -1;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2240 attr = PyUnicode_Substring(name, pos,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2241 (dot != -1) ? dot :
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2242 PyUnicode_GET_LENGTH(name));
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2243 if (!attr)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2244 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2245 ADDOP_O(c, LOAD_ATTR, attr, names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2246 Py_DECREF(attr);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2247 pos = dot + 1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2248 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2249 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2250 return compiler_nameop(c, asname, Store);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2251 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2254 compiler_import(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2255 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2256 /* The Import node stores a module name like a.b.c as a single
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2257 string. This is convenient for all cases except
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2258 import a.b.c as d
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2259 where we need to parse that string to extract the individual
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2260 module names.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2261 XXX Perhaps change the representation to make this case simpler?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2262 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2263 int i, n = asdl_seq_LEN(s->v.Import.names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2264
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2265 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2266 alias_ty alias = (alias_ty)asdl_seq_GET(s->v.Import.names, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2267 int r;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2268 PyObject *level;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2269
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2270 level = PyLong_FromLong(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2271 if (level == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2272 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2273
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2274 ADDOP_O(c, LOAD_CONST, level, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2275 Py_DECREF(level);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2276 ADDOP_O(c, LOAD_CONST, Py_None, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2277 ADDOP_NAME(c, IMPORT_NAME, alias->name, names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2278
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2279 if (alias->asname) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2280 r = compiler_import_as(c, alias->name, alias->asname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2281 if (!r)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2282 return r;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2283 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2284 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2285 identifier tmp = alias->name;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2286 Py_ssize_t dot = PyUnicode_FindChar(
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2287 alias->name, '.', 0, PyUnicode_GET_LENGTH(alias->name), 1);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2288 if (dot != -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2289 tmp = PyUnicode_Substring(alias->name, 0, dot);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2290 r = compiler_nameop(c, tmp, Store);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2291 if (dot != -1) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2292 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2293 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2294 if (!r)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2295 return r;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2296 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2297 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2298 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2299 }
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2302 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	2303 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2304 int i, n = asdl_seq_LEN(s->v.ImportFrom.names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2305
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2306 PyObject *names = PyTuple_New(n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2307 PyObject *level;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2308 static PyObject *empty_string;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2309
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2310 if (!empty_string) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2311 empty_string = PyUnicode_FromString("");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2312 if (!empty_string)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2313 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2314 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2315
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2316 if (!names)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2317 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2318
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2319 level = PyLong_FromLong(s->v.ImportFrom.level);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2320 if (!level) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2321 Py_DECREF(names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2322 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2323 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2324
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2325 /* build up the names */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2326 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2327 alias_ty alias = (alias_ty)asdl_seq_GET(s->v.ImportFrom.names, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2328 Py_INCREF(alias->name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2329 PyTuple_SET_ITEM(names, i, alias->name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2330 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2331
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2332 if (s->lineno > c->c_future->ff_lineno && s->v.ImportFrom.module &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2333 !PyUnicode_CompareWithASCIIString(s->v.ImportFrom.module, "__future__")) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2334 Py_DECREF(level);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2335 Py_DECREF(names);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2336 return compiler_error(c, "from __future__ imports must occur "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2337 "at the beginning of the file");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2338 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2339
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2340 ADDOP_O(c, LOAD_CONST, level, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2341 Py_DECREF(level);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2342 ADDOP_O(c, LOAD_CONST, names, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2343 Py_DECREF(names);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2344 if (s->v.ImportFrom.module) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2345 ADDOP_NAME(c, IMPORT_NAME, s->v.ImportFrom.module, names);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2346 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2347 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2348 ADDOP_NAME(c, IMPORT_NAME, empty_string, names);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	2349 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2350 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2351 alias_ty alias = (alias_ty)asdl_seq_GET(s->v.ImportFrom.names, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2352 identifier store_name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2353
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2354 if (i == 0 && PyUnicode_READ_CHAR(alias->name, 0) == '*') {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2355 assert(n == 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2356 ADDOP(c, IMPORT_STAR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2357 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2358 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2359
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2360 ADDOP_NAME(c, IMPORT_FROM, alias->name, names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2361 store_name = alias->name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2362 if (alias->asname)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2363 store_name = alias->asname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2364
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2365 if (!compiler_nameop(c, store_name, Store)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2366 Py_DECREF(names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2367 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2368 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2369 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2370 /* remove imported module */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2371 ADDOP(c, POP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2372 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2373 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2374
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2375 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2376 compiler_assert(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2377 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2378 static PyObject *assertion_error = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2379 basicblock *end;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2380
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	2381 if (c->c_optimize)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2382 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2383 if (assertion_error == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2384 assertion_error = PyUnicode_InternFromString("AssertionError");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2385 if (assertion_error == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2386 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2387 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2388 if (s->v.Assert.test->kind == Tuple_kind &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2389 asdl_seq_LEN(s->v.Assert.test->v.Tuple.elts) > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2390 const char* msg =
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2391 "assertion is always true, perhaps remove parentheses?";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2392 if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, c->c_filename,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2393 c->u->u_lineno, NULL, NULL) == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2394 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2395 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2396 VISIT(c, expr, s->v.Assert.test);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2397 end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2398 if (end == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2399 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2400 ADDOP_JABS(c, POP_JUMP_IF_TRUE, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2401 ADDOP_O(c, LOAD_GLOBAL, assertion_error, names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2402 if (s->v.Assert.msg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2403 VISIT(c, expr, s->v.Assert.msg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2404 ADDOP_I(c, CALL_FUNCTION, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2405 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2406 ADDOP_I(c, RAISE_VARARGS, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2407 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2408 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2409 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2410
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2411 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2412 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	2413 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2414 int i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2415
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2416 /* Always assign a lineno to the next instruction for a stmt. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2417 c->u->u_lineno = s->lineno;
64861 861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64620 diff changeset	2418 c->u->u_col_offset = s->col_offset;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2419 c->u->u_lineno_set = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2420
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2421 switch (s->kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2422 case FunctionDef_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2423 return compiler_function(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2424 case ClassDef_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2425 return compiler_class(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2426 case Return_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2427 if (c->u->u_ste->ste_type != FunctionBlock)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2428 return compiler_error(c, "'return' outside function");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2429 if (s->v.Return.value) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2430 VISIT(c, expr, s->v.Return.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2431 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2432 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2433 ADDOP_O(c, LOAD_CONST, Py_None, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2434 ADDOP(c, RETURN_VALUE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2435 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2436 case Delete_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2437 VISIT_SEQ(c, expr, s->v.Delete.targets)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2438 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2439 case Assign_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2440 n = asdl_seq_LEN(s->v.Assign.targets);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2441 VISIT(c, expr, s->v.Assign.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2442 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2443 if (i < n - 1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2444 ADDOP(c, DUP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2445 VISIT(c, expr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2446 (expr_ty)asdl_seq_GET(s->v.Assign.targets, i));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2447 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2448 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2449 case AugAssign_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2450 return compiler_augassign(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2451 case For_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2452 return compiler_for(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2453 case While_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2454 return compiler_while(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2455 case If_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2456 return compiler_if(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2457 case Raise_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2458 n = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2459 if (s->v.Raise.exc) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2460 VISIT(c, expr, s->v.Raise.exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2461 n++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2462 if (s->v.Raise.cause) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2463 VISIT(c, expr, s->v.Raise.cause);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2464 n++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2465 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2466 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2467 ADDOP_I(c, RAISE_VARARGS, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2468 break;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2469 case Try_kind:
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70445 diff changeset	2470 return compiler_try(c, s);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2471 case Assert_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2472 return compiler_assert(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2473 case Import_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2474 return compiler_import(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2475 case ImportFrom_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2476 return compiler_from_import(c, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2477 case Global_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2478 case Nonlocal_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2479 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2480 case Expr_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2481 if (c->c_interactive && c->c_nestlevel <= 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2482 VISIT(c, expr, s->v.Expr.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2483 ADDOP(c, PRINT_EXPR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2484 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2485 else if (s->v.Expr.value->kind != Str_kind &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2486 s->v.Expr.value->kind != Num_kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2487 VISIT(c, expr, s->v.Expr.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2488 ADDOP(c, POP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2489 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2490 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2491 case Pass_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2492 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2493 case Break_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2494 if (!compiler_in_loop(c))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2495 return compiler_error(c, "'break' outside loop");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2496 ADDOP(c, BREAK_LOOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2497 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2498 case Continue_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2499 return compiler_continue(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2500 case With_kind:
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	2501 return compiler_with(c, s, 0);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2502 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2503 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2504 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2505
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2506 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2507 unaryop(unaryop_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2508 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2509 switch (op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2510 case Invert:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2511 return UNARY_INVERT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2512 case Not:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2513 return UNARY_NOT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2514 case UAdd:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2515 return UNARY_POSITIVE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2516 case USub:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2517 return UNARY_NEGATIVE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2518 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2519 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2520 "unary op %d should not be possible", op);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2521 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2522 }
35742 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 binop(struct compiler *c, operator_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2527 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2528 switch (op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2529 case Add:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2530 return BINARY_ADD;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2531 case Sub:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2532 return BINARY_SUBTRACT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2533 case Mult:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2534 return BINARY_MULTIPLY;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2535 case Div:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2536 return BINARY_TRUE_DIVIDE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2537 case Mod:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2538 return BINARY_MODULO;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2539 case Pow:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2540 return BINARY_POWER;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2541 case LShift:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2542 return BINARY_LSHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2543 case RShift:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2544 return BINARY_RSHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2545 case BitOr:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2546 return BINARY_OR;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2547 case BitXor:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2548 return BINARY_XOR;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2549 case BitAnd:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2550 return BINARY_AND;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2551 case FloorDiv:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2552 return BINARY_FLOOR_DIVIDE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2553 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2554 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2555 "binary op %d should not be possible", op);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2556 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2557 }
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2560 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2561 cmpop(cmpop_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2562 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2563 switch (op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2564 case Eq:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2565 return PyCmp_EQ;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2566 case NotEq:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2567 return PyCmp_NE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2568 case Lt:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2569 return PyCmp_LT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2570 case LtE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2571 return PyCmp_LE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2572 case Gt:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2573 return PyCmp_GT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2574 case GtE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2575 return PyCmp_GE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2576 case Is:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2577 return PyCmp_IS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2578 case IsNot:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2579 return PyCmp_IS_NOT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2580 case In:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2581 return PyCmp_IN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2582 case NotIn:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2583 return PyCmp_NOT_IN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2584 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2585 return PyCmp_BAD;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2586 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2587 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2588
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2589 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2590 inplace_binop(struct compiler *c, operator_ty op)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2591 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2592 switch (op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2593 case Add:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2594 return INPLACE_ADD;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2595 case Sub:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2596 return INPLACE_SUBTRACT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2597 case Mult:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2598 return INPLACE_MULTIPLY;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2599 case Div:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2600 return INPLACE_TRUE_DIVIDE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2601 case Mod:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2602 return INPLACE_MODULO;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2603 case Pow:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2604 return INPLACE_POWER;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2605 case LShift:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2606 return INPLACE_LSHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2607 case RShift:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2608 return INPLACE_RSHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2609 case BitOr:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2610 return INPLACE_OR;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2611 case BitXor:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2612 return INPLACE_XOR;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2613 case BitAnd:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2614 return INPLACE_AND;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2615 case FloorDiv:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2616 return INPLACE_FLOOR_DIVIDE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2617 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2618 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2619 "inplace binary op %d should not be possible", op);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2620 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2621 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2622 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2623
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2624 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2625 compiler_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	2626 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2627 int op, scope, arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2628 enum { OP_FAST, OP_GLOBAL, OP_DEREF, OP_NAME } optype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2629
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2630 PyObject *dict = c->u->u_names;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2631 PyObject *mangled;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2632 /* XXX AugStore isn't used anywhere! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2633
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2634 mangled = _Py_Mangle(c->u->u_private, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2635 if (!mangled)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2636 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2637
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2638 op = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2639 optype = OP_NAME;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2640 scope = PyST_GetScope(c->u->u_ste, mangled);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2641 switch (scope) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2642 case FREE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2643 dict = c->u->u_freevars;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2644 optype = OP_DEREF;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2645 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2646 case CELL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2647 dict = c->u->u_cellvars;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2648 optype = OP_DEREF;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2649 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2650 case LOCAL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2651 if (c->u->u_ste->ste_type == FunctionBlock)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2652 optype = OP_FAST;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2653 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2654 case GLOBAL_IMPLICIT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2655 if (c->u->u_ste->ste_type == FunctionBlock &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2656 !c->u->u_ste->ste_unoptimized)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2657 optype = OP_GLOBAL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2658 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2659 case GLOBAL_EXPLICIT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2660 optype = OP_GLOBAL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2661 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2662 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2663 /* scope can be 0 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2664 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2665 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2666
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2667 /* XXX Leave assert here, but handle __doc__ and the like better */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	2668 assert(scope \|\| PyUnicode_READ_CHAR(name, 0) == '_');
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2669
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2670 switch (optype) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2671 case OP_DEREF:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2672 switch (ctx) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2673 case Load: op = LOAD_DEREF; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2674 case Store: op = STORE_DEREF; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2675 case AugLoad:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2676 case AugStore:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2677 break;
64620 25cc226dc9bd #4617: Previously it was illegal to delete a name from the local Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 64439 diff changeset	2678 case Del: op = DELETE_DEREF; break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2679 case Param:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2680 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2681 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2682 "param invalid for deref variable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2683 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2684 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2685 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2686 case OP_FAST:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2687 switch (ctx) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2688 case Load: op = LOAD_FAST; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2689 case Store: op = STORE_FAST; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2690 case Del: op = DELETE_FAST; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2691 case AugLoad:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2692 case AugStore:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2693 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2694 case Param:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2695 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2696 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2697 "param invalid for local variable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2698 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2699 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2700 ADDOP_O(c, op, mangled, varnames);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2701 Py_DECREF(mangled);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2702 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2703 case OP_GLOBAL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2704 switch (ctx) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2705 case Load: op = LOAD_GLOBAL; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2706 case Store: op = STORE_GLOBAL; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2707 case Del: op = DELETE_GLOBAL; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2708 case AugLoad:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2709 case AugStore:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2710 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2711 case Param:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2712 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2713 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2714 "param invalid for global variable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2715 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2716 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2717 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2718 case OP_NAME:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2719 switch (ctx) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2720 case Load: op = LOAD_NAME; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2721 case Store: op = STORE_NAME; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2722 case Del: op = DELETE_NAME; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2723 case AugLoad:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2724 case AugStore:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2725 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2726 case Param:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2727 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2728 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2729 "param invalid for name variable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2730 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2731 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2732 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2733 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2734
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2735 assert(op);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2736 arg = compiler_add_o(c, dict, mangled);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2737 Py_DECREF(mangled);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2738 if (arg < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2739 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2740 return compiler_addop_i(c, op, arg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2741 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2742
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2743 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2744 compiler_boolop(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2745 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2746 basicblock *end;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2747 int jumpi, i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2748 asdl_seq *s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2749
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2750 assert(e->kind == BoolOp_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2751 if (e->v.BoolOp.op == And)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2752 jumpi = JUMP_IF_FALSE_OR_POP;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2753 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2754 jumpi = JUMP_IF_TRUE_OR_POP;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2755 end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2756 if (end == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2757 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2758 s = e->v.BoolOp.values;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2759 n = asdl_seq_LEN(s) - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2760 assert(n >= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2761 for (i = 0; i < n; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2762 VISIT(c, expr, (expr_ty)asdl_seq_GET(s, i));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2763 ADDOP_JABS(c, jumpi, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2764 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2765 VISIT(c, expr, (expr_ty)asdl_seq_GET(s, n));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2766 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2767 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2768 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2769
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2770 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2771 compiler_list(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2772 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2773 int n = asdl_seq_LEN(e->v.List.elts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2774 if (e->v.List.ctx == Store) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2775 int i, seen_star = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2776 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2777 expr_ty elt = asdl_seq_GET(e->v.List.elts, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2778 if (elt->kind == Starred_kind && !seen_star) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2779 if ((i >= (1 << 8)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2780 (n-i-1 >= (INT_MAX >> 8)))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2781 return compiler_error(c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2782 "too many expressions in "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2783 "star-unpacking assignment");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2784 ADDOP_I(c, UNPACK_EX, (i + ((n-i-1) << 8)));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2785 seen_star = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2786 asdl_seq_SET(e->v.List.elts, i, elt->v.Starred.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2787 } else if (elt->kind == Starred_kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2788 return compiler_error(c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2789 "two starred expressions in assignment");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2790 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2791 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2792 if (!seen_star) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2793 ADDOP_I(c, UNPACK_SEQUENCE, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2794 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2795 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2796 VISIT_SEQ(c, expr, e->v.List.elts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2797 if (e->v.List.ctx == Load) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2798 ADDOP_I(c, BUILD_LIST, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2799 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2800 return 1;
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2803 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2804 compiler_tuple(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2805 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2806 int n = asdl_seq_LEN(e->v.Tuple.elts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2807 if (e->v.Tuple.ctx == Store) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2808 int i, seen_star = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2809 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2810 expr_ty elt = asdl_seq_GET(e->v.Tuple.elts, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2811 if (elt->kind == Starred_kind && !seen_star) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2812 if ((i >= (1 << 8)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2813 (n-i-1 >= (INT_MAX >> 8)))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2814 return compiler_error(c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2815 "too many expressions in "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2816 "star-unpacking assignment");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2817 ADDOP_I(c, UNPACK_EX, (i + ((n-i-1) << 8)));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2818 seen_star = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2819 asdl_seq_SET(e->v.Tuple.elts, i, elt->v.Starred.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2820 } else if (elt->kind == Starred_kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2821 return compiler_error(c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2822 "two starred expressions in assignment");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2823 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2824 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2825 if (!seen_star) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2826 ADDOP_I(c, UNPACK_SEQUENCE, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2827 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2828 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2829 VISIT_SEQ(c, expr, e->v.Tuple.elts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2830 if (e->v.Tuple.ctx == Load) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2831 ADDOP_I(c, BUILD_TUPLE, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2832 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2833 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2834 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2835
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2836 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2837 compiler_compare(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2838 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2839 int i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2840 basicblock *cleanup = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2841
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2842 /* XXX the logic can be cleaned up for 1 or multiple comparisons */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2843 VISIT(c, expr, e->v.Compare.left);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2844 n = asdl_seq_LEN(e->v.Compare.ops);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2845 assert(n > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2846 if (n > 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2847 cleanup = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2848 if (cleanup == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2849 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2850 VISIT(c, expr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2851 (expr_ty)asdl_seq_GET(e->v.Compare.comparators, 0));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2852 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2853 for (i = 1; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2854 ADDOP(c, DUP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2855 ADDOP(c, ROT_THREE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2856 ADDOP_I(c, COMPARE_OP,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2857 cmpop((cmpop_ty)(asdl_seq_GET(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2858 e->v.Compare.ops, i - 1))));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2859 ADDOP_JABS(c, JUMP_IF_FALSE_OR_POP, cleanup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2860 NEXT_BLOCK(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2861 if (i < (n - 1))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2862 VISIT(c, expr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2863 (expr_ty)asdl_seq_GET(e->v.Compare.comparators, i));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2864 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2865 VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Compare.comparators, n - 1));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2866 ADDOP_I(c, COMPARE_OP,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2867 cmpop((cmpop_ty)(asdl_seq_GET(e->v.Compare.ops, n - 1))));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2868 if (n > 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2869 basicblock *end = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2870 if (end == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2871 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2872 ADDOP_JREL(c, JUMP_FORWARD, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2873 compiler_use_next_block(c, cleanup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2874 ADDOP(c, ROT_TWO);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2875 ADDOP(c, POP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2876 compiler_use_next_block(c, end);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2877 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2878 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2879 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2880
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2881 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2882 compiler_call(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2883 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2884 VISIT(c, expr, e->v.Call.func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2885 return compiler_call_helper(c, 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2886 e->v.Call.args,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2887 e->v.Call.keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2888 e->v.Call.starargs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2889 e->v.Call.kwargs);
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	2890 }
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	2891
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	2892 /* shared code between compiler_call and compiler_class */
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	2893 static int
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	2894 compiler_call_helper(struct compiler *c,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2895 int n, /* Args already pushed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2896 asdl_seq *args,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2897 asdl_seq *keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2898 expr_ty starargs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2899 expr_ty kwargs)
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	2900 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2901 int code = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2902
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2903 n += asdl_seq_LEN(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2904 VISIT_SEQ(c, expr, args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2905 if (keywords) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2906 VISIT_SEQ(c, keyword, keywords);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2907 n \|= asdl_seq_LEN(keywords) << 8;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2908 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2909 if (starargs) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2910 VISIT(c, expr, starargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2911 code \|= 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2912 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2913 if (kwargs) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2914 VISIT(c, expr, kwargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2915 code \|= 2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2916 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2917 switch (code) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2918 case 0:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2919 ADDOP_I(c, CALL_FUNCTION, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2920 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2921 case 1:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2922 ADDOP_I(c, CALL_FUNCTION_VAR, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2923 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2924 case 2:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2925 ADDOP_I(c, CALL_FUNCTION_KW, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2926 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2927 case 3:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2928 ADDOP_I(c, CALL_FUNCTION_VAR_KW, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2929 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2930 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2931 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2932 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2933
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2934
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2935 /* List and set comprehensions and generator expressions work by creating a
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2936 nested function to perform the actual iteration. This means that the
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2937 iteration variables don't leak into the current scope.
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2938 The defined function is called immediately following its definition, with the
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2939 result of that call being the result of the expression.
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2940 The LC/SC version returns the populated container, while the GE version is
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2941 flagged in symtable.c as a generator, so it returns the generator object
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2942 when the function is called.
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2943 This code knows that the loop cannot contain break, continue, or return,
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2944 so it cheats and skips the SETUP_LOOP/POP_BLOCK steps used in normal loops.
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2945
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2946 Possible cleanups:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2947 - iterate over the generator sequence instead of using recursion
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2948 */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	2949
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2950 static int
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2951 compiler_comprehension_generator(struct compiler *c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2952 asdl_seq *generators, int gen_index,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2953 expr_ty elt, expr_ty val, int type)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	2954 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2955 /* generate code for the iterator, then each of the ifs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2956 and then write to the element */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2957
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2958 comprehension_ty gen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2959 basicblock start, anchor, skip, if_cleanup;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2960 int i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2961
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2962 start = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2963 skip = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2964 if_cleanup = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2965 anchor = compiler_new_block(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2966
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2967 if (start == NULL \|\| skip == NULL \|\| if_cleanup == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2968 anchor == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2969 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2970
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2971 gen = (comprehension_ty)asdl_seq_GET(generators, gen_index);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2972
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2973 if (gen_index == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2974 /* Receive outermost iter as an implicit argument */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2975 c->u->u_argcount = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2976 ADDOP_I(c, LOAD_FAST, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2977 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2978 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2979 /* Sub-iter - calculate on the fly */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2980 VISIT(c, expr, gen->iter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2981 ADDOP(c, GET_ITER);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2982 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2983 compiler_use_next_block(c, start);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2984 ADDOP_JREL(c, FOR_ITER, anchor);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2985 NEXT_BLOCK(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2986 VISIT(c, expr, gen->target);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2987
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2988 /* XXX this needs to be cleaned up...a lot! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2989 n = asdl_seq_LEN(gen->ifs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2990 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2991 expr_ty e = (expr_ty)asdl_seq_GET(gen->ifs, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2992 VISIT(c, expr, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2993 ADDOP_JABS(c, POP_JUMP_IF_FALSE, if_cleanup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2994 NEXT_BLOCK(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2995 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2996
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2997 if (++gen_index < asdl_seq_LEN(generators))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2998 if (!compiler_comprehension_generator(c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	2999 generators, gen_index,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3000 elt, val, type))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3001 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3002
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3003 /* only append after the last for generator */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3004 if (gen_index >= asdl_seq_LEN(generators)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3005 /* comprehension specific code */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3006 switch (type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3007 case COMP_GENEXP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3008 VISIT(c, expr, elt);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3009 ADDOP(c, YIELD_VALUE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3010 ADDOP(c, POP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3011 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3012 case COMP_LISTCOMP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3013 VISIT(c, expr, elt);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3014 ADDOP_I(c, LIST_APPEND, gen_index + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3015 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3016 case COMP_SETCOMP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3017 VISIT(c, expr, elt);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3018 ADDOP_I(c, SET_ADD, gen_index + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3019 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3020 case COMP_DICTCOMP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3021 /* With 'd[k] = v', v is evaluated before k, so we do
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3022 the same. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3023 VISIT(c, expr, val);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3024 VISIT(c, expr, elt);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3025 ADDOP_I(c, MAP_ADD, gen_index + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3026 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3027 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3028 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3029 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3030
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3031 compiler_use_next_block(c, skip);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3032 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3033 compiler_use_next_block(c, if_cleanup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3034 ADDOP_JABS(c, JUMP_ABSOLUTE, start);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3035 compiler_use_next_block(c, anchor);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3036
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3037 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3038 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3039
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3040 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3041 compiler_comprehension(struct compiler *c, expr_ty e, int type, identifier name,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3042 asdl_seq *generators, expr_ty elt, expr_ty val)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3043 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3044 PyCodeObject *co = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3045 expr_ty outermost_iter;
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	3046 PyObject *qualname = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3047
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3048 outermost_iter = ((comprehension_ty)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3049 asdl_seq_GET(generators, 0))->iter;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3050
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	3051 if (!compiler_enter_scope(c, name, COMPILER_SCOPE_COMPREHENSION,
e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	3052 (void *)e, e->lineno))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3053 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3054
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3055 if (type != COMP_GENEXP) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3056 int op;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3057 switch (type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3058 case COMP_LISTCOMP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3059 op = BUILD_LIST;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3060 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3061 case COMP_SETCOMP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3062 op = BUILD_SET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3063 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3064 case COMP_DICTCOMP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3065 op = BUILD_MAP;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3066 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3067 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3068 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3069 "unknown comprehension type %d", type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3070 goto error_in_scope;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3071 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3072
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3073 ADDOP_I(c, op, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3074 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3075
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3076 if (!compiler_comprehension_generator(c, generators, 0, elt,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3077 val, type))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3078 goto error_in_scope;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3079
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3080 if (type != COMP_GENEXP) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3081 ADDOP(c, RETURN_VALUE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3082 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3083
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3084 co = assemble(c, 1);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	3085 qualname = compiler_scope_qualname(c);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3086 compiler_exit_scope(c);
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	3087 if (qualname == NULL \|\| co == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3088 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3089
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	3090 if (!compiler_make_closure(c, co, 0, qualname))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3091 goto error;
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	3092 Py_DECREF(qualname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3093 Py_DECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3094
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3095 VISIT(c, expr, outermost_iter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3096 ADDOP(c, GET_ITER);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3097 ADDOP_I(c, CALL_FUNCTION, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3098 return 1;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3099 error_in_scope:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3100 compiler_exit_scope(c);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3101 error:
73738 e1dbc72bd97f PEP 3155 / issue #13448: Qualified name for classes and functions. Antoine Pitrou <solipsis@pitrou.net> parents: 72493 diff changeset	3102 Py_XDECREF(qualname);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3103 Py_XDECREF(co);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3104 return 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3105 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3106
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3107 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3108 compiler_genexp(struct compiler *c, expr_ty e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3109 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3110 static identifier name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3111 if (!name) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3112 name = PyUnicode_FromString("<genexpr>");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3113 if (!name)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3114 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3115 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3116 assert(e->kind == GeneratorExp_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3117 return compiler_comprehension(c, e, COMP_GENEXP, name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3118 e->v.GeneratorExp.generators,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3119 e->v.GeneratorExp.elt, NULL);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3120 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3121
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3122 static int
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3123 compiler_listcomp(struct compiler *c, expr_ty e)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3124 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3125 static identifier name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3126 if (!name) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3127 name = PyUnicode_FromString("<listcomp>");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3128 if (!name)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3129 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3130 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3131 assert(e->kind == ListComp_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3132 return compiler_comprehension(c, e, COMP_LISTCOMP, name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3133 e->v.ListComp.generators,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3134 e->v.ListComp.elt, NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3135 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3136
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3137 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3138 compiler_setcomp(struct compiler *c, expr_ty e)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3139 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3140 static identifier name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3141 if (!name) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3142 name = PyUnicode_FromString("<setcomp>");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3143 if (!name)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3144 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3145 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3146 assert(e->kind == SetComp_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3147 return compiler_comprehension(c, e, COMP_SETCOMP, name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3148 e->v.SetComp.generators,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3149 e->v.SetComp.elt, NULL);
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42089 diff changeset	3150 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42089 diff changeset	3151
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42089 diff changeset	3152
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42089 diff changeset	3153 static int
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42089 diff changeset	3154 compiler_dictcomp(struct compiler *c, expr_ty e)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42089 diff changeset	3155 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3156 static identifier name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3157 if (!name) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3158 name = PyUnicode_FromString("<dictcomp>");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3159 if (!name)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3160 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3161 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3162 assert(e->kind == DictComp_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3163 return compiler_comprehension(c, e, COMP_DICTCOMP, name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3164 e->v.DictComp.generators,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3165 e->v.DictComp.key, e->v.DictComp.value);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3166 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3167
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3168
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41273 diff changeset	3169 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3170 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	3171 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3172 ADDOP_O(c, LOAD_CONST, k->arg, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3173 VISIT(c, expr, k->value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3174 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3175 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3176
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3177 /* 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	3178 whether they are true or false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3179
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3180 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	3181 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3182
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3183 static int
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	3184 expr_constant(struct compiler *c, expr_ty e)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3185 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3186 char *id;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3187 switch (e->kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3188 case Ellipsis_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3189 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3190 case Num_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3191 return PyObject_IsTrue(e->v.Num.n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3192 case Str_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3193 return PyObject_IsTrue(e->v.Str.s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3194 case Name_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3195 /* optimize away names that can't be reassigned */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70889 diff changeset	3196 id = PyUnicode_AsUTF8(e->v.Name.id);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3197 if (strcmp(id, "True") == 0) return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3198 if (strcmp(id, "False") == 0) return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3199 if (strcmp(id, "None") == 0) return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3200 if (strcmp(id, "__debug__") == 0)
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	3201 return ! c->c_optimize;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3202 /* fall through */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3203 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3204 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3205 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3206 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3207
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3208 /*
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3209 Implements the with statement from PEP 343.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3210
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3211 The semantics outlined in that PEP are as follows:
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3212
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3213 with EXPR as VAR:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3214 BLOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3215
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3216 It is implemented roughly as:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3217
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3218 context = EXPR
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3219 exit = context.__exit__ # not calling it
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3220 value = context.__enter__()
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3221 try:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3222 VAR = value # if VAR present in the syntax
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3223 BLOCK
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3224 finally:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3225 if an exception was raised:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3226 exc = copy of (exception, instance, traceback)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3227 else:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3228 exc = (None, None, None)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3229 exit(*exc)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3230 */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3231 static int
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3232 compiler_with(struct compiler *c, stmt_ty s, int pos)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3233 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3234 basicblock block, finally;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3235 withitem_ty item = asdl_seq_GET(s->v.With.items, pos);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3236
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3237 assert(s->kind == With_kind);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3238
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3239 block = compiler_new_block(c);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3240 finally = compiler_new_block(c);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3241 if (!block \|\| !finally)
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	3242 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3243
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3244 /* Evaluate EXPR */
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3245 VISIT(c, expr, item->context_expr);
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53816 diff changeset	3246 ADDOP_JREL(c, SETUP_WITH, finally);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53816 diff changeset	3247
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53816 diff changeset	3248 /* SETUP_WITH pushes a finally block. */
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3249 compiler_use_next_block(c, block);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3250 if (!compiler_push_fblock(c, FINALLY_TRY, block)) {
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	3251 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3252 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3253
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3254 if (item->optional_vars) {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3255 VISIT(c, expr, item->optional_vars);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3256 }
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53816 diff changeset	3257 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3258 /* Discard result from context.__enter__() */
62455 eb95af0a99cb Merged revisions 82169 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62389 diff changeset	3259 ADDOP(c, POP_TOP);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3260 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3261
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3262 pos++;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3263 if (pos == asdl_seq_LEN(s->v.With.items))
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3264 /* BLOCK code */
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3265 VISIT_SEQ(c, stmt, s->v.With.body)
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3266 else if (!compiler_with(c, s, pos))
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 70436 diff changeset	3267 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3268
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3269 /* End of try block; start the finally block */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3270 ADDOP(c, POP_BLOCK);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3271 compiler_pop_fblock(c, FINALLY_TRY, block);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3272
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3273 ADDOP_O(c, LOAD_CONST, Py_None, consts);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3274 compiler_use_next_block(c, finally);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3275 if (!compiler_push_fblock(c, FINALLY_END, finally))
62456 2907ce8bfbb6 Merged revisions 82171 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	3276 return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3277
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45760 diff changeset	3278 /* Finally block starts; context.__exit__ is on the stack under
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45760 diff changeset	3279 the exception or return information. Just issue our magic
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45760 diff changeset	3280 opcode. */
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3281 ADDOP(c, WITH_CLEANUP);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3282
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3283 /* Finally block ends. */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3284 ADDOP(c, END_FINALLY);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3285 compiler_pop_fblock(c, FINALLY_END, finally);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3286 return 1;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3287 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36666 diff changeset	3288
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3289 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3290 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	3291 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3292 int i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3293
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3294 /* If expr e has a different line number than the last expr/stmt,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3295 set a new line number for the next instruction.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3296 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3297 if (e->lineno > c->u->u_lineno) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3298 c->u->u_lineno = e->lineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3299 c->u->u_lineno_set = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3300 }
64861 861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64620 diff changeset	3301 /* Updating the column offset is always harmless. */
861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64620 diff changeset	3302 c->u->u_col_offset = e->col_offset;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3303 switch (e->kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3304 case BoolOp_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3305 return compiler_boolop(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3306 case BinOp_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3307 VISIT(c, expr, e->v.BinOp.left);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3308 VISIT(c, expr, e->v.BinOp.right);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3309 ADDOP(c, binop(c, e->v.BinOp.op));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3310 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3311 case UnaryOp_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3312 VISIT(c, expr, e->v.UnaryOp.operand);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3313 ADDOP(c, unaryop(e->v.UnaryOp.op));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3314 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3315 case Lambda_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3316 return compiler_lambda(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3317 case IfExp_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3318 return compiler_ifexp(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3319 case Dict_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3320 n = asdl_seq_LEN(e->v.Dict.values);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3321 ADDOP_I(c, BUILD_MAP, (n>0xFFFF ? 0xFFFF : n));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3322 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3323 VISIT(c, expr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3324 (expr_ty)asdl_seq_GET(e->v.Dict.values, i));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3325 VISIT(c, expr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3326 (expr_ty)asdl_seq_GET(e->v.Dict.keys, i));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3327 ADDOP(c, STORE_MAP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3328 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3329 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3330 case Set_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3331 n = asdl_seq_LEN(e->v.Set.elts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3332 VISIT_SEQ(c, expr, e->v.Set.elts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3333 ADDOP_I(c, BUILD_SET, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3334 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3335 case GeneratorExp_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3336 return compiler_genexp(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3337 case ListComp_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3338 return compiler_listcomp(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3339 case SetComp_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3340 return compiler_setcomp(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3341 case DictComp_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3342 return compiler_dictcomp(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3343 case Yield_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3344 if (c->u->u_ste->ste_type != FunctionBlock)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3345 return compiler_error(c, "'yield' outside function");
80589 ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3346 if (e->v.Yield.value) {
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3347 VISIT(c, expr, e->v.Yield.value);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3348 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3349 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3350 ADDOP_O(c, LOAD_CONST, Py_None, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3351 }
80589 ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3352 ADDOP(c, YIELD_VALUE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3353 break;
80589 ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3354 case YieldFrom_kind:
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3355 if (c->u->u_ste->ste_type != FunctionBlock)
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3356 return compiler_error(c, "'yield' outside function");
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3357 VISIT(c, expr, e->v.YieldFrom.value);
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3358 ADDOP(c, GET_ITER);
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3359 ADDOP_O(c, LOAD_CONST, Py_None, consts);
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3360 ADDOP(c, YIELD_FROM);
ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 80239 diff changeset	3361 break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3362 case Compare_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3363 return compiler_compare(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3364 case Call_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3365 return compiler_call(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3366 case Num_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3367 ADDOP_O(c, LOAD_CONST, e->v.Num.n, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3368 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3369 case Str_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3370 ADDOP_O(c, LOAD_CONST, e->v.Str.s, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3371 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3372 case Bytes_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3373 ADDOP_O(c, LOAD_CONST, e->v.Bytes.s, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3374 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3375 case Ellipsis_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3376 ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3377 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3378 /* The following exprs can be assignment targets. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3379 case Attribute_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3380 if (e->v.Attribute.ctx != AugStore)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3381 VISIT(c, expr, e->v.Attribute.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3382 switch (e->v.Attribute.ctx) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3383 case AugLoad:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3384 ADDOP(c, DUP_TOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3385 /* Fall through to load */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3386 case Load:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3387 ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3388 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3389 case AugStore:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3390 ADDOP(c, ROT_TWO);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3391 /* Fall through to save */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3392 case Store:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3393 ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3394 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3395 case Del:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3396 ADDOP_NAME(c, DELETE_ATTR, e->v.Attribute.attr, names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3397 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3398 case Param:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3399 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3400 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3401 "param invalid in attribute expression");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3402 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3403 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3404 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3405 case Subscript_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3406 switch (e->v.Subscript.ctx) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3407 case AugLoad:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3408 VISIT(c, expr, e->v.Subscript.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3409 VISIT_SLICE(c, e->v.Subscript.slice, AugLoad);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3410 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3411 case Load:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3412 VISIT(c, expr, e->v.Subscript.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3413 VISIT_SLICE(c, e->v.Subscript.slice, Load);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3414 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3415 case AugStore:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3416 VISIT_SLICE(c, e->v.Subscript.slice, AugStore);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3417 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3418 case Store:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3419 VISIT(c, expr, e->v.Subscript.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3420 VISIT_SLICE(c, e->v.Subscript.slice, Store);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3421 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3422 case Del:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3423 VISIT(c, expr, e->v.Subscript.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3424 VISIT_SLICE(c, e->v.Subscript.slice, Del);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3425 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3426 case Param:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3427 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3428 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3429 "param invalid in subscript expression");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3430 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3431 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3432 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3433 case Starred_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3434 switch (e->v.Starred.ctx) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3435 case Store:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3436 /* In all legitimate cases, the Starred node was already replaced
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3437 * by compiler_list/compiler_tuple. XXX: is that okay? */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3438 return compiler_error(c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3439 "starred assignment target must be in a list or tuple");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3440 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3441 return compiler_error(c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3442 "can use starred expression only as assignment target");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3443 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3444 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3445 case Name_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3446 return compiler_nameop(c, e->v.Name.id, e->v.Name.ctx);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3447 /* child nodes of List and Tuple will have expr_context set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3448 case List_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3449 return compiler_list(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3450 case Tuple_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3451 return compiler_tuple(c, e);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3452 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3453 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3454 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3455
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3456 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3457 compiler_augassign(struct compiler *c, stmt_ty s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3458 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3459 expr_ty e = s->v.AugAssign.target;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3460 expr_ty auge;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3461
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3462 assert(s->kind == AugAssign_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3463
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3464 switch (e->kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3465 case Attribute_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3466 auge = Attribute(e->v.Attribute.value, e->v.Attribute.attr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3467 AugLoad, e->lineno, e->col_offset, c->c_arena);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3468 if (auge == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3469 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3470 VISIT(c, expr, auge);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3471 VISIT(c, expr, s->v.AugAssign.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3472 ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3473 auge->v.Attribute.ctx = AugStore;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3474 VISIT(c, expr, auge);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3475 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3476 case Subscript_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3477 auge = Subscript(e->v.Subscript.value, e->v.Subscript.slice,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3478 AugLoad, e->lineno, e->col_offset, c->c_arena);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3479 if (auge == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3480 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3481 VISIT(c, expr, auge);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3482 VISIT(c, expr, s->v.AugAssign.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3483 ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3484 auge->v.Subscript.ctx = AugStore;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3485 VISIT(c, expr, auge);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3486 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3487 case Name_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3488 if (!compiler_nameop(c, e->v.Name.id, Load))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3489 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3490 VISIT(c, expr, s->v.AugAssign.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3491 ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3492 return compiler_nameop(c, e->v.Name.id, Store);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3493 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3494 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3495 "invalid node type (%d) for augmented assignment",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3496 e->kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3497 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3498 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3499 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3500 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3501
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3502 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3503 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	3504 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3505 struct fblockinfo *f;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3506 if (c->u->u_nfblocks >= CO_MAXBLOCKS) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3507 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3508 "too many statically nested blocks");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3509 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3510 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3511 f = &c->u->u_fblock[c->u->u_nfblocks++];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3512 f->fb_type = t;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3513 f->fb_block = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3514 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3515 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3516
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3517 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3518 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	3519 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3520 struct compiler_unit *u = c->u;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3521 assert(u->u_nfblocks > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3522 u->u_nfblocks--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3523 assert(u->u_fblock[u->u_nfblocks].fb_type == t);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3524 assert(u->u_fblock[u->u_nfblocks].fb_block == b);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3525 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3526
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3527 static int
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3528 compiler_in_loop(struct compiler *c) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3529 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3530 struct compiler_unit *u = c->u;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3531 for (i = 0; i < u->u_nfblocks; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3532 if (u->u_fblock[i].fb_type == LOOP)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3533 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3534 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3535 return 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3536 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3537 /* Raises a SyntaxError and returns 0.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3538 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	3539 */
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3542 compiler_error(struct compiler c, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3543 {
70435 27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	3544 PyObject *loc;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3545 PyObject u = NULL, v = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3546
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3547 loc = PyErr_ProgramText(c->c_filename, c->u->u_lineno);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3548 if (!loc) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3549 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3550 loc = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3551 }
70435 27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	3552 u = Py_BuildValue("(OiiO)", c->c_filename_obj, c->u->u_lineno,
64861 861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64620 diff changeset	3553 c->u->u_col_offset, loc);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3554 if (!u)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3555 goto exit;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3556 v = Py_BuildValue("(zO)", errstr, u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3557 if (!v)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3558 goto exit;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3559 PyErr_SetObject(PyExc_SyntaxError, v);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3560 exit:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3561 Py_DECREF(loc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3562 Py_XDECREF(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3563 Py_XDECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3564 return 0;
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3567 static int
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3568 compiler_handle_subscr(struct compiler c, const char kind,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3569 expr_context_ty ctx)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3570 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3571 int op = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3572
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3573 /* XXX this code is duplicated */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3574 switch (ctx) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3575 case AugLoad: /* fall through to Load */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3576 case Load: op = BINARY_SUBSCR; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3577 case AugStore:/* fall through to Store */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3578 case Store: op = STORE_SUBSCR; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3579 case Del: op = DELETE_SUBSCR; break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3580 case Param:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3581 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3582 "invalid %s kind %d in subscript\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3583 kind, ctx);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3584 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3585 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3586 if (ctx == AugLoad) {
64439 725231211273 Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced Antoine Pitrou <solipsis@pitrou.net> parents: 63114 diff changeset	3587 ADDOP(c, DUP_TOP_TWO);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3588 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3589 else if (ctx == AugStore) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3590 ADDOP(c, ROT_THREE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3591 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3592 ADDOP(c, op);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3593 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3594 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3595
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3596 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3597 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	3598 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3599 int n = 2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3600 assert(s->kind == Slice_kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3601
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3602 /* only handles the cases where BUILD_SLICE is emitted */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3603 if (s->v.Slice.lower) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3604 VISIT(c, expr, s->v.Slice.lower);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3605 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3606 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3607 ADDOP_O(c, LOAD_CONST, Py_None, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3608 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3609
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3610 if (s->v.Slice.upper) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3611 VISIT(c, expr, s->v.Slice.upper);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3612 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3613 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3614 ADDOP_O(c, LOAD_CONST, Py_None, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3615 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3616
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3617 if (s->v.Slice.step) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3618 n++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3619 VISIT(c, expr, s->v.Slice.step);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3620 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3621 ADDOP_I(c, BUILD_SLICE, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3622 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3623 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3624
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3625 static int
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3626 compiler_visit_nested_slice(struct compiler *c, slice_ty s,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3627 expr_context_ty ctx)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3628 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3629 switch (s->kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3630 case Slice_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3631 return compiler_slice(c, s, ctx);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3632 case Index_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3633 VISIT(c, expr, s->v.Index.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3634 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3635 case ExtSlice_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3636 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3637 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3638 "extended slice invalid in nested slice");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3639 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3640 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3641 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3642 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3643
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3644 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3645 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	3646 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3647 char * kindname = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3648 switch (s->kind) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3649 case Index_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3650 kindname = "index";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3651 if (ctx != AugStore) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3652 VISIT(c, expr, s->v.Index.value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3653 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3654 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3655 case Slice_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3656 kindname = "slice";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3657 if (ctx != AugStore) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3658 if (!compiler_slice(c, s, ctx))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3659 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3660 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3661 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3662 case ExtSlice_kind:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3663 kindname = "extended slice";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3664 if (ctx != AugStore) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3665 int i, n = asdl_seq_LEN(s->v.ExtSlice.dims);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3666 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3667 slice_ty sub = (slice_ty)asdl_seq_GET(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3668 s->v.ExtSlice.dims, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3669 if (!compiler_visit_nested_slice(c, sub, ctx))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3670 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3671 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3672 ADDOP_I(c, BUILD_TUPLE, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3673 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3674 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3675 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3676 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3677 "invalid subscript kind %d", s->kind);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3678 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3679 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3680 return compiler_handle_subscr(c, kindname, ctx);
35742 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
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3683 /* 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	3684
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3685 /* 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	3686 post records the block indices in post-order.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3687
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3688 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	3689 */
c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3690
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3691 struct assembler {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3692 PyObject a_bytecode; / string containing bytecode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3693 int a_offset; /* offset into bytecode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3694 int a_nblocks; /* number of reachable blocks */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3695 basicblock *a_postorder; / list of blocks in dfs postorder */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3696 PyObject a_lnotab; / string containing lnotab */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3697 int a_lnotab_off; /* offset into lnotab */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3698 int a_lineno; /* last lineno of emitted instruction */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3699 int a_lineno_off; /* bytecode offset of last lineno */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3700 };
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3701
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3702 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3703 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	3704 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3705 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3706 struct instr *instr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3707
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3708 if (b->b_seen)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3709 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3710 b->b_seen = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3711 if (b->b_next != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3712 dfs(c, b->b_next, a);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3713 for (i = 0; i < b->b_iused; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3714 instr = &b->b_instr[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3715 if (instr->i_jrel \|\| instr->i_jabs)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3716 dfs(c, instr->i_target, a);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3717 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3718 a->a_postorder[a->a_nblocks++] = b;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3719 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3720
35860 9b885c934144 make internal method static Neal Norwitz <nnorwitz@gmail.com> parents: 35797 diff changeset	3721 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3722 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	3723 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3724 int i, target_depth;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3725 struct instr *instr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3726 if (b->b_seen \|\| b->b_startdepth >= depth)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3727 return maxdepth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3728 b->b_seen = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3729 b->b_startdepth = depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3730 for (i = 0; i < b->b_iused; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3731 instr = &b->b_instr[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3732 depth += opcode_stack_effect(instr->i_opcode, instr->i_oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3733 if (depth > maxdepth)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3734 maxdepth = depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3735 assert(depth >= 0); /* invalid code or bug in stackdepth() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3736 if (instr->i_jrel \|\| instr->i_jabs) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3737 target_depth = depth;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3738 if (instr->i_opcode == FOR_ITER) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3739 target_depth = depth-2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3740 } else if (instr->i_opcode == SETUP_FINALLY \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3741 instr->i_opcode == SETUP_EXCEPT) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3742 target_depth = depth+3;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3743 if (target_depth > maxdepth)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3744 maxdepth = target_depth;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3745 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3746 maxdepth = stackdepth_walk(c, instr->i_target,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3747 target_depth, maxdepth);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3748 if (instr->i_opcode == JUMP_ABSOLUTE \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3749 instr->i_opcode == JUMP_FORWARD) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3750 goto out; /* remaining code is dead */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3751 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3752 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3753 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3754 if (b->b_next)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3755 maxdepth = stackdepth_walk(c, b->b_next, depth, maxdepth);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3756 out:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3757 b->b_seen = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3758 return maxdepth;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3759 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3760
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3761 /* 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	3762 * 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	3763 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3764 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3765 stackdepth(struct compiler *c)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3766 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3767 basicblock b, entryblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3768 entryblock = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3769 for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3770 b->b_seen = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3771 b->b_startdepth = INT_MIN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3772 entryblock = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3773 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3774 if (!entryblock)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3775 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3776 return stackdepth_walk(c, entryblock, 0, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3777 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3778
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3779 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3780 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	3781 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3782 memset(a, 0, sizeof(struct assembler));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3783 a->a_lineno = firstlineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3784 a->a_bytecode = PyBytes_FromStringAndSize(NULL, DEFAULT_CODE_SIZE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3785 if (!a->a_bytecode)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3786 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3787 a->a_lnotab = PyBytes_FromStringAndSize(NULL, DEFAULT_LNOTAB_SIZE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3788 if (!a->a_lnotab)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3789 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3790 if (nblocks > PY_SIZE_MAX / sizeof(basicblock *)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3791 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3792 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3793 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3794 a->a_postorder = (basicblock **)PyObject_Malloc(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3795 sizeof(basicblock ) nblocks);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3796 if (!a->a_postorder) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3797 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3798 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3799 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3800 return 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3801 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3802
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3803 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3804 assemble_free(struct assembler *a)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3805 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3806 Py_XDECREF(a->a_bytecode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3807 Py_XDECREF(a->a_lnotab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3808 if (a->a_postorder)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3809 PyObject_Free(a->a_postorder);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3810 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3811
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3812 /* 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	3813
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3814 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3815 instrsize(struct instr *instr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3816 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3817 if (!instr->i_hasarg)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3818 return 1; /* 1 byte for the opcode*/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3819 if (instr->i_oparg > 0xffff)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3820 return 6; /* 1 (opcode) + 1 (EXTENDED_ARG opcode) + 2 (oparg) + 2(oparg extended) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3821 return 3; /* 1 (opcode) + 2 (oparg) */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3822 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3823
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3824 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3825 blocksize(basicblock *b)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3826 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3827 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3828 int size = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3829
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3830 for (i = 0; i < b->b_iused; i++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3831 size += instrsize(&b->b_instr[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3832 return size;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3833 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3834
55372 79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54918 diff changeset	3835 /* Appends a pair to the end of the line number table, a_lnotab, representing
79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54918 diff changeset	3836 the instruction's bytecode offset and line number. See
79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54918 diff changeset	3837 Objects/lnotab_notes.txt for the description of the line number table. */
18065 889db6d55506 SF bug 430991: wrong co_lnotab Tim Peters <tim.peters@gmail.com> parents: 17736 diff changeset	3838
17518 f939ce52a734 Make some private symbols static. Guido van Rossum <guido@python.org> parents: 17355 diff changeset	3839 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3840 assemble_lnotab(struct assembler a, struct instr i)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3841 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3842 int d_bytecode, d_lineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3843 int len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3844 unsigned char *lnotab;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3845
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3846 d_bytecode = a->a_offset - a->a_lineno_off;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3847 d_lineno = i->i_lineno - a->a_lineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3848
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3849 assert(d_bytecode >= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3850 assert(d_lineno >= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3851
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3852 if(d_bytecode == 0 && d_lineno == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3853 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3854
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3855 if (d_bytecode > 255) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3856 int j, nbytes, ncodes = d_bytecode / 255;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3857 nbytes = a->a_lnotab_off + 2 * ncodes;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3858 len = PyBytes_GET_SIZE(a->a_lnotab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3859 if (nbytes >= len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3860 if ((len <= INT_MAX / 2) && (len * 2 < nbytes))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3861 len = nbytes;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3862 else if (len <= INT_MAX / 2)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3863 len *= 2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3864 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3865 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3866 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3867 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3868 if (_PyBytes_Resize(&a->a_lnotab, len) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3869 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3870 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3871 lnotab = (unsigned char *)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3872 PyBytes_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3873 for (j = 0; j < ncodes; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3874 *lnotab++ = 255;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3875 *lnotab++ = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3876 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3877 d_bytecode -= ncodes * 255;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3878 a->a_lnotab_off += ncodes * 2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3879 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3880 assert(d_bytecode <= 255);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3881 if (d_lineno > 255) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3882 int j, nbytes, ncodes = d_lineno / 255;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3883 nbytes = a->a_lnotab_off + 2 * ncodes;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3884 len = PyBytes_GET_SIZE(a->a_lnotab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3885 if (nbytes >= len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3886 if ((len <= INT_MAX / 2) && len * 2 < nbytes)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3887 len = nbytes;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3888 else if (len <= INT_MAX / 2)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3889 len *= 2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3890 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3891 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3892 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3893 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3894 if (_PyBytes_Resize(&a->a_lnotab, len) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3895 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3896 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3897 lnotab = (unsigned char *)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3898 PyBytes_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3899 *lnotab++ = d_bytecode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3900 *lnotab++ = 255;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3901 d_bytecode = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3902 for (j = 1; j < ncodes; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3903 *lnotab++ = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3904 *lnotab++ = 255;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3905 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3906 d_lineno -= ncodes * 255;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3907 a->a_lnotab_off += ncodes * 2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3908 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3909
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3910 len = PyBytes_GET_SIZE(a->a_lnotab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3911 if (a->a_lnotab_off + 2 >= len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3912 if (_PyBytes_Resize(&a->a_lnotab, len * 2) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3913 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3914 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3915 lnotab = (unsigned char *)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3916 PyBytes_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3917
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3918 a->a_lnotab_off += 2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3919 if (d_bytecode) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3920 *lnotab++ = d_bytecode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3921 *lnotab++ = d_lineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3922 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3923 else { /* First line of a block; def stmt, etc. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3924 *lnotab++ = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3925 *lnotab++ = d_lineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3926 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3927 a->a_lineno = i->i_lineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3928 a->a_lineno_off = a->a_offset;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3929 return 1;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	3930 }
16015 c832ef72499d This patch introduces an extra pass to the compiler that generates a Jeremy Hylton <jeremy@alum.mit.edu> parents: 16006 diff changeset	3931
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3932 /* assemble_emit()
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3933 Extend the bytecode with a new instruction.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3934 Update lnotab if necessary.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3935 */
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	3936
24855 bed5d5e536bc Add warnings for assignment or deletion of variables and attributes Guido van Rossum <guido@python.org> parents: 24854 diff changeset	3937 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3938 assemble_emit(struct assembler a, struct instr i)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3939 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3940 int size, arg = 0, ext = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3941 Py_ssize_t len = PyBytes_GET_SIZE(a->a_bytecode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3942 char *code;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3943
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3944 size = instrsize(i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3945 if (i->i_hasarg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3946 arg = i->i_oparg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3947 ext = arg >> 16;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3948 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3949 if (i->i_lineno && !assemble_lnotab(a, i))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3950 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3951 if (a->a_offset + size >= len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3952 if (len > PY_SSIZE_T_MAX / 2)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3953 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3954 if (_PyBytes_Resize(&a->a_bytecode, len * 2) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3955 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3956 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3957 code = PyBytes_AS_STRING(a->a_bytecode) + a->a_offset;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3958 a->a_offset += size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3959 if (size == 6) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3960 assert(i->i_hasarg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3961 *code++ = (char)EXTENDED_ARG;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3962 *code++ = ext & 0xff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3963 *code++ = ext >> 8;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3964 arg &= 0xffff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3965 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3966 *code++ = i->i_opcode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3967 if (i->i_hasarg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3968 assert(size == 3 \|\| size == 6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3969 *code++ = arg & 0xff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3970 *code++ = arg >> 8;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3971 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3972 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	3973 }
30f8b654c2e5 SF Patch [ 429024 ] deal with some unary ops at compile time Jeremy Hylton <jeremy@alum.mit.edu> parents: 19177 diff changeset	3974
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	3975 static void
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	3976 assemble_jump_offsets(struct assembler a, struct compiler c)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3977 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3978 basicblock *b;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3979 int bsize, totsize, extended_arg_count = 0, last_extended_arg_count;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3980 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3981
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3982 /* Compute the size of each block and fixup jump args.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	3983 Replace block pointer with position in bytecode. */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3984 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3985 totsize = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3986 for (i = a->a_nblocks - 1; i >= 0; i--) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3987 b = a->a_postorder[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3988 bsize = blocksize(b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3989 b->b_offset = totsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3990 totsize += bsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3991 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3992 last_extended_arg_count = extended_arg_count;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3993 extended_arg_count = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3994 for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3995 bsize = b->b_offset;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3996 for (i = 0; i < b->b_iused; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3997 struct instr *instr = &b->b_instr[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3998 /* Relative jumps are computed relative to
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	3999 the instruction pointer after fetching
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4000 the jump instruction.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4001 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4002 bsize += instrsize(instr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4003 if (instr->i_jabs)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4004 instr->i_oparg = instr->i_target->b_offset;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4005 else if (instr->i_jrel) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4006 int delta = instr->i_target->b_offset - bsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4007 instr->i_oparg = delta;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4008 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4009 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4010 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4011 if (instr->i_oparg > 0xffff)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4012 extended_arg_count++;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4013 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4014 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4015
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4016 /* XXX: This is an awful hack that could hurt performance, but
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4017 on the bright side it should work until we come up
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4018 with a better solution.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4019
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4020 The issue is that in the first loop blocksize() is called
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4021 which calls instrsize() which requires i_oparg be set
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4022 appropriately. There is a bootstrap problem because
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4023 i_oparg is calculated in the second loop above.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4024
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4025 So we loop until we stop seeing new EXTENDED_ARGs.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4026 The only EXTENDED_ARGs that could be popping up are
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4027 ones in jump instructions. So this should converge
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4028 fairly quickly.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4029 */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59673 diff changeset	4030 } while (last_extended_arg_count != extended_arg_count);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4031 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4032
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4033 static PyObject *
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4034 dict_keys_inorder(PyObject *dict, int offset)
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4035 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4036 PyObject tuple, k, *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4037 Py_ssize_t i, pos = 0, size = PyDict_Size(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4038
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4039 tuple = PyTuple_New(size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4040 if (tuple == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4041 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4042 while (PyDict_Next(dict, &pos, &k, &v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4043 i = PyLong_AS_LONG(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4044 /* The keys of the dictionary are tuples. (see compiler_add_o)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4045 The object we want is always first, though. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4046 k = PyTuple_GET_ITEM(k, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4047 Py_INCREF(k);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4048 assert((i - offset) < size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4049 assert((i - offset) >= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4050 PyTuple_SET_ITEM(tuple, i - offset, k);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4051 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4052 return tuple;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4053 }
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16250 diff changeset	4054
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4055 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4056 compute_code_flags(struct compiler *c)
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16408 diff changeset	4057 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4058 PySTEntryObject *ste = c->u->u_ste;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4059 int flags = 0, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4060 if (ste->ste_type != ModuleBlock)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4061 flags \|= CO_NEWLOCALS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4062 if (ste->ste_type == FunctionBlock) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4063 if (!ste->ste_unoptimized)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4064 flags \|= CO_OPTIMIZED;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4065 if (ste->ste_nested)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4066 flags \|= CO_NESTED;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4067 if (ste->ste_generator)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4068 flags \|= CO_GENERATOR;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4069 if (ste->ste_varargs)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4070 flags \|= CO_VARARGS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4071 if (ste->ste_varkeywords)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4072 flags \|= CO_VARKEYWORDS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4073 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4074
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4075 /* (Only) inherit compilerflags in PyCF_MASK */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4076 flags \|= (c->c_flags->cf_flags & PyCF_MASK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4077
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4078 n = PyDict_Size(c->u->u_freevars);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4079 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4080 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4081 if (n == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4082 n = PyDict_Size(c->u->u_cellvars);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4083 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4084 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4085 if (n == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4086 flags \|= CO_NOFREE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4087 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4088 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4089
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4090 return flags;
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4091 }
eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4092
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4093 static PyCodeObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4094 makecode(struct compiler c, struct assembler a)
4129 eedaa59341b9 Name mangling, what the heck! Guido van Rossum <guido@python.org> parents: 4003 diff changeset	4095 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4096 PyObject *tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4097 PyCodeObject *co = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4098 PyObject *consts = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4099 PyObject *names = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4100 PyObject *varnames = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4101 PyObject *name = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4102 PyObject *freevars = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4103 PyObject *cellvars = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4104 PyObject *bytecode = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4105 int nlocals, flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4106
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4107 tmp = dict_keys_inorder(c->u->u_consts, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4108 if (!tmp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4109 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4110 consts = PySequence_List(tmp); /* optimize_code requires a list */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4111 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4112
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4113 names = dict_keys_inorder(c->u->u_names, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4114 varnames = dict_keys_inorder(c->u->u_varnames, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4115 if (!consts \|\| !names \|\| !varnames)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4116 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4117
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4118 cellvars = dict_keys_inorder(c->u->u_cellvars, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4119 if (!cellvars)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4120 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4121 freevars = dict_keys_inorder(c->u->u_freevars, PyTuple_Size(cellvars));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4122 if (!freevars)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4123 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4124 nlocals = PyDict_Size(c->u->u_varnames);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4125 flags = compute_code_flags(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4126 if (flags < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4127 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4128
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4129 bytecode = PyCode_Optimize(a->a_bytecode, consts, names, a->a_lnotab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4130 if (!bytecode)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4131 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4132
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4133 tmp = PyList_AsTuple(consts); /* PyCode_New requires a tuple */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4134 if (!tmp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4135 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4136 Py_DECREF(consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4137 consts = tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4138
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4139 co = PyCode_New(c->u->u_argcount, c->u->u_kwonlyargcount,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4140 nlocals, stackdepth(c), flags,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4141 bytecode, consts, names, varnames,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4142 freevars, cellvars,
70435 27359a4e0f8c try to use the same str object for all code filenames when compiling or unmarshalling (#12190) Benjamin Peterson <benjamin@python.org> parents: 70397 diff changeset	4143 c->c_filename_obj, c->u->u_name,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4144 c->u->u_firstlineno,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4145 a->a_lnotab);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4146 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4147 Py_XDECREF(consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4148 Py_XDECREF(names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4149 Py_XDECREF(varnames);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4150 Py_XDECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4151 Py_XDECREF(freevars);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4152 Py_XDECREF(cellvars);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4153 Py_XDECREF(bytecode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4154 return co;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4155 }
5041 c497929b2371 Instead of emitting SET_LINENO instructions, generate a line number Guido van Rossum <guido@python.org> parents: 5011 diff changeset	4156
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4157
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4158 /* For debugging purposes only */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4159 #if 0
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4160 static void
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4161 dump_instr(const struct instr *i)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4162 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4163 const char *jrel = i->i_jrel ? "jrel " : "";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4164 const char *jabs = i->i_jabs ? "jabs " : "";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4165 char arg[128];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4166
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4167 *arg = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4168 if (i->i_hasarg)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4169 sprintf(arg, "arg: %d ", i->i_oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4170
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4171 fprintf(stderr, "line: %d, opcode: %d %s%s%s\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4172 i->i_lineno, i->i_opcode, arg, jabs, jrel);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4173 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4174
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4175 static void
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4176 dump_basicblock(const basicblock *b)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4177 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4178 const char *seen = b->b_seen ? "seen " : "";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4179 const char *b_return = b->b_return ? "return " : "";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4180 fprintf(stderr, "used: %d, depth: %d, offset: %d %s%s\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4181 b->b_iused, b->b_startdepth, b->b_offset, seen, b_return);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4182 if (b->b_instr) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4183 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4184 for (i = 0; i < b->b_iused; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4185 fprintf(stderr, " [%02d] ", i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4186 dump_instr(b->b_instr + i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4187 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4188 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4189 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4190 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	4191
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4192 static PyCodeObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4193 assemble(struct compiler *c, int addNone)
16781 5a1230de436a Preliminary support for future nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16763 diff changeset	4194 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4195 basicblock b, entryblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4196 struct assembler a;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4197 int i, j, nblocks;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4198 PyCodeObject *co = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4199
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4200 /* Make sure every block that falls off the end returns None.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4201 XXX NEXT_BLOCK() isn't quite right, because if the last
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4202 block ends with a jump or return b_next shouldn't set.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4203 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4204 if (!c->u->u_curblock->b_return) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4205 NEXT_BLOCK(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4206 if (addNone)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4207 ADDOP_O(c, LOAD_CONST, Py_None, consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4208 ADDOP(c, RETURN_VALUE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4209 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4210
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4211 nblocks = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4212 entryblock = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4213 for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4214 nblocks++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4215 entryblock = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4216 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4217
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4218 /* Set firstlineno if it wasn't explicitly set. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4219 if (!c->u->u_firstlineno) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4220 if (entryblock && entryblock->b_instr)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4221 c->u->u_firstlineno = entryblock->b_instr->i_lineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4222 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4223 c->u->u_firstlineno = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4224 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4225 if (!assemble_init(&a, nblocks, c->u->u_firstlineno))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4226 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4227 dfs(c, entryblock, &a);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4228
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4229 /* Can't modify the bytecode after computing jump offsets. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4230 assemble_jump_offsets(&a, c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4231
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4232 /* Emit code in reverse postorder from dfs. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4233 for (i = a.a_nblocks - 1; i >= 0; i--) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4234 b = a.a_postorder[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4235 for (j = 0; j < b->b_iused; j++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4236 if (!assemble_emit(&a, &b->b_instr[j]))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4237 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4238 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4239
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4240 if (_PyBytes_Resize(&a.a_lnotab, a.a_lnotab_off) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4241 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4242 if (_PyBytes_Resize(&a.a_bytecode, a.a_offset) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4243 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4244
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4245 co = makecode(c, &a);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35310 diff changeset	4246 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4247 assemble_free(&a);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57502 diff changeset	4248 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	4249 }
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4250
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4251 #undef PyAST_Compile
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4252 PyAPI_FUNC(PyCodeObject *)
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4253 PyAST_Compile(mod_ty mod, const char filename, PyCompilerFlags flags,
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4254 PyArena *arena)
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4255 {
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4256 return PyAST_CompileEx(mod, filename, flags, -1, arena);
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4257 }
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4258
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66556 diff changeset	4259

Mercurial > cpython-lru_cache-weakref

annotate Python/compile.c @ 80589:ffb2fa900cb7 3.3