cpython-lru_cache-weakref: Lib/compiler/pycodegen.py annotate

annotate Lib/compiler/pycodegen.py @ 57303:4aa4c19dfaed legacy-trunk

#1757126: fix typo with the cyrillic_asian alias

author	Philip Jenvey <pjenvey@underboss.org>
date	Tue, 17 Nov 2009 02:42:26 +0000
parents	ef8fe9088696
children	442e170b56c3

rev	line source
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1 import imp
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	2 import os
11710 38c4d61db7ea rapid evolution towards producing real .pyc files (even though I don't Jeremy Hylton <jeremy@alum.mit.edu> parents: 11705 diff changeset	3 import marshal
11724 71d038db0dd2 now produces valid pyc files for a least a trivial subset of the Jeremy Hylton <jeremy@alum.mit.edu> parents: 11710 diff changeset	4 import struct
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	5 import sys
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	6 from cStringIO import StringIO
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	7
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	8 from compiler import ast, parse, walk, syntax
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	9 from compiler import pyassem, misc, future, symbols
51425 4809afa85a9b Issue #999042: The Python compiler now handles explict global statements Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 51420 diff changeset	10 from compiler.consts import SC_LOCAL, SC_GLOBAL_IMPLICIT, SC_GLOBAL_EXPLICT, \
4809afa85a9b Issue #999042: The Python compiler now handles explict global statements Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 51420 diff changeset	11 SC_FREE, SC_CELL
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	12 from compiler.consts import (CO_VARARGS, CO_VARKEYWORDS, CO_NEWLOCALS,
36821 12bcd16c31ad Hopefully this removes all vestiges of CO_GENERATOR_ALLOWED that can Neal Norwitz <nnorwitz@gmail.com> parents: 36820 diff changeset	13 CO_NESTED, CO_GENERATOR, CO_FUTURE_DIVISION,
45897 c77e3119e267 Fixed compiler module so __future__ print_function is compilable. Eric Smith <eric@trueblade.com> parents: 45703 diff changeset	14 CO_FUTURE_ABSIMPORT, CO_FUTURE_WITH_STATEMENT, CO_FUTURE_PRINT_FUNCTION)
19619 5663b883ea5d Fix _convert_NAME() so that it doesn't store locals for class bodies. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19609 diff changeset	15 from compiler.pyassem import TupleArg
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	16
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	17 # XXX The version-specific code can go, since this code only works with 2.x.
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	18 # Do we have Python 1.x or Python 2.x?
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	19 try:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	20 VERSION = sys.version_info[0]
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	21 except AttributeError:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	22 VERSION = 1
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	23
12563 b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	24 callfunc_opcode_info = {
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	25 # (Have args, Have *args) : opcode
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	26 (0,0) : "CALL_FUNCTION",
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	27 (1,0) : "CALL_FUNCTION_VAR",
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	28 (0,1) : "CALL_FUNCTION_KW",
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	29 (1,1) : "CALL_FUNCTION_VAR_KW",
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	30 }
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	31
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	32 LOOP = 1
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	33 EXCEPT = 2
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	34 TRY_FINALLY = 3
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	35 END_FINALLY = 4
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	36
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	37 def compileFile(filename, display=0):
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	38 f = open(filename, 'U')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	39 buf = f.read()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	40 f.close()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	41 mod = Module(buf, filename)
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	42 try:
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	43 mod.compile(display)
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	44 except SyntaxError:
19943 6773dcfe34a3 Last set of change to get regression tests to pass Jeremy Hylton <jeremy@alum.mit.edu> parents: 19939 diff changeset	45 raise
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	46 else:
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	47 f = open(filename + "c", "wb")
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	48 mod.dump(f)
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	49 f.close()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	50
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	51 def compile(source, filename, mode, flags=None, dont_inherit=None):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	52 """Replacement for builtin compile() function"""
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	53 if flags is not None or dont_inherit is not None:
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	54 raise RuntimeError, "not implemented yet"
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	55
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	56 if mode == "single":
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	57 gen = Interactive(source, filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	58 elif mode == "exec":
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	59 gen = Module(source, filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	60 elif mode == "eval":
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	61 gen = Expression(source, filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	62 else:
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	63 raise ValueError("compile() 3rd arg must be 'exec' or "
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	64 "'eval' or 'single'")
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	65 gen.compile()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	66 return gen.code
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	67
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	68 class AbstractCompileMode:
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	69
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	70 mode = None # defined by subclass
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	71
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	72 def __init__(self, source, filename):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	73 self.source = source
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	74 self.filename = filename
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	75 self.code = None
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	76
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	77 def _get_tree(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	78 tree = parse(self.source, self.mode)
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	79 misc.set_filename(self.filename, tree)
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	80 syntax.check(tree)
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	81 return tree
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	82
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	83 def compile(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	84 pass # implemented by subclass
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	85
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	86 def getCode(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	87 return self.code
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	88
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	89 class Expression(AbstractCompileMode):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	90
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	91 mode = "eval"
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	92
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	93 def compile(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	94 tree = self._get_tree()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	95 gen = ExpressionCodeGenerator(tree)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	96 self.code = gen.getCode()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	97
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	98 class Interactive(AbstractCompileMode):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	99
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	100 mode = "single"
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	101
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	102 def compile(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	103 tree = self._get_tree()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	104 gen = InteractiveCodeGenerator(tree)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	105 self.code = gen.getCode()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	106
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	107 class Module(AbstractCompileMode):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	108
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	109 mode = "exec"
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	110
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	111 def compile(self, display=0):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	112 tree = self._get_tree()
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	113 gen = ModuleCodeGenerator(tree)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	114 if display:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	115 import pprint
17346 f8fdbeb73667 Add support for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 15379 diff changeset	116 print pprint.pprint(tree)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	117 self.code = gen.getCode()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	118
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	119 def dump(self, f):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	120 f.write(self.getPycHeader())
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	121 marshal.dump(self.code, f)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	122
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	123 MAGIC = imp.get_magic()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	124
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	125 def getPycHeader(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	126 # compile.c uses marshal to write a long directly, with
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	127 # calling the interface that would also generate a 1-byte code
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	128 # to indicate the type of the value. simplest way to get the
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	129 # same effect is to call marshal and then skip the code.
23710 44b9977d4848 Remove uses of string module and stat.ST_MODE Neal Norwitz <nnorwitz@gmail.com> parents: 21958 diff changeset	130 mtime = os.path.getmtime(self.filename)
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	131 mtime = struct.pack('<i', mtime)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	132 return self.MAGIC + mtime
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	133
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	134 class LocalNameFinder:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	135 """Find local names in scope"""
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	136 def __init__(self, names=()):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	137 self.names = misc.Set()
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	138 self.globals = misc.Set()
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	139 for name in names:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	140 self.names.add(name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	141
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	142 # XXX list comprehensions and for loops
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	143
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	144 def getLocals(self):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	145 for elt in self.globals.elements():
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	146 if self.names.has_elt(elt):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	147 self.names.remove(elt)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	148 return self.names
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	149
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	150 def visitDict(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	151 pass
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	152
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	153 def visitGlobal(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	154 for name in node.names:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	155 self.globals.add(name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	156
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	157 def visitFunction(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	158 self.names.add(node.name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	159
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	160 def visitLambda(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	161 pass
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	162
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	163 def visitImport(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	164 for name, alias in node.names:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	165 self.names.add(alias or name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	166
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	167 def visitFrom(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	168 for name, alias in node.names:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	169 self.names.add(alias or name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	170
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	171 def visitClass(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	172 self.names.add(node.name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	173
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	174 def visitAssName(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	175 self.names.add(node.name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	176
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	177 def is_constant_false(node):
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	178 if isinstance(node, ast.Const):
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	179 if not node.value:
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	180 return 1
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	181 return 0
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	182
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	183 class CodeGenerator:
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	184 """Defines basic code generator for Python bytecode
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	185
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	186 This class is an abstract base class. Concrete subclasses must
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	187 define an __init__() that defines self.graph and then calls the
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	188 __init__() defined in this class.
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	189
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	190 The concrete class must also define the class attributes
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	191 NameFinder, FunctionGen, and ClassGen. These attributes can be
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	192 defined in the initClass() method, which is a hook for
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	193 initializing these methods after all the classes have been
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	194 defined.
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	195 """
11743 c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	196
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	197 optimized = 0 # is namespace access optimized?
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	198 __initialized = None
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	199 class_name = None # provide default for instance variable
11751 3f1da05ced55 add support for Lambda nodes Jeremy Hylton <jeremy@alum.mit.edu> parents: 11748 diff changeset	200
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	201 def __init__(self):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	202 if self.__initialized is None:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	203 self.initClass()
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	204 self.__class__.__initialized = 1
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	205 self.checkClass()
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	206 self.locals = misc.Stack()
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	207 self.setups = misc.Stack()
14362 a665bdc4922f patch by Neil Schemenauer to improve (fix?) line number generation Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	208 self.last_lineno = None
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	209 self._setupGraphDelegation()
19936 6944f5b9de03 support true division Jeremy Hylton <jeremy@alum.mit.edu> parents: 19923 diff changeset	210 self._div_op = "BINARY_DIVIDE"
11793 d2ab9553f871 support for arglists with implicit tuple unpacks Jeremy Hylton <jeremy@alum.mit.edu> parents: 11789 diff changeset	211
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	212 # XXX set flags based on future features
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	213 futures = self.get_module().futures
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	214 for feature in futures:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	215 if feature == "division":
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	216 self.graph.setFlag(CO_FUTURE_DIVISION)
19936 6944f5b9de03 support true division Jeremy Hylton <jeremy@alum.mit.edu> parents: 19923 diff changeset	217 self._div_op = "BINARY_TRUE_DIVIDE"
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	218 elif feature == "absolute_import":
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	219 self.graph.setFlag(CO_FUTURE_ABSIMPORT)
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	220 elif feature == "with_statement":
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	221 self.graph.setFlag(CO_FUTURE_WITH_STATEMENT)
45897 c77e3119e267 Fixed compiler module so __future__ print_function is compilable. Eric Smith <eric@trueblade.com> parents: 45703 diff changeset	222 elif feature == "print_function":
c77e3119e267 Fixed compiler module so __future__ print_function is compilable. Eric Smith <eric@trueblade.com> parents: 45703 diff changeset	223 self.graph.setFlag(CO_FUTURE_PRINT_FUNCTION)
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	224
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	225 def initClass(self):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	226 """This method is called once for each class"""
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	227
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	228 def checkClass(self):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	229 """Verify that class is constructed correctly"""
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	230 try:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	231 assert hasattr(self, 'graph')
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	232 assert getattr(self, 'NameFinder')
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	233 assert getattr(self, 'FunctionGen')
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	234 assert getattr(self, 'ClassGen')
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	235 except AssertionError, msg:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	236 intro = "Bad class construction for %s" % self.__class__.__name__
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	237 raise AssertionError, intro
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	238
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	239 def _setupGraphDelegation(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	240 self.emit = self.graph.emit
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	241 self.newBlock = self.graph.newBlock
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	242 self.startBlock = self.graph.startBlock
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	243 self.nextBlock = self.graph.nextBlock
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	244 self.setDocstring = self.graph.setDocstring
11793 d2ab9553f871 support for arglists with implicit tuple unpacks Jeremy Hylton <jeremy@alum.mit.edu> parents: 11789 diff changeset	245
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	246 def getCode(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	247 """Return a code object"""
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	248 return self.graph.getCode()
11754 dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	249
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	250 def mangle(self, name):
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	251 if self.class_name is not None:
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	252 return misc.mangle(name, self.class_name)
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	253 else:
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	254 return name
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	255
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	256 def parseSymbols(self, tree):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	257 s = symbols.SymbolVisitor()
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	258 walk(tree, s)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	259 return s.scopes
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	260
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	261 def get_module(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	262 raise RuntimeError, "should be implemented by subclasses"
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	263
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	264 # Next five methods handle name access
11724 71d038db0dd2 now produces valid pyc files for a least a trivial subset of the Jeremy Hylton <jeremy@alum.mit.edu> parents: 11710 diff changeset	265
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	266 def isLocalName(self, name):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	267 return self.locals.top().has_elt(name)
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	268
11743 c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	269 def storeName(self, name):
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	270 self._nameOp('STORE', name)
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	271
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	272 def loadName(self, name):
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	273 self._nameOp('LOAD', name)
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	274
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	275 def delName(self, name):
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	276 self._nameOp('DELETE', name)
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	277
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	278 def _nameOp(self, prefix, name):
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	279 name = self.mangle(name)
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	280 scope = self.scope.check_name(name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	281 if scope == SC_LOCAL:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	282 if not self.optimized:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	283 self.emit(prefix + '_NAME', name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	284 else:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	285 self.emit(prefix + '_FAST', name)
51425 4809afa85a9b Issue #999042: The Python compiler now handles explict global statements Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 51420 diff changeset	286 elif scope == SC_GLOBAL_EXPLICT:
4809afa85a9b Issue #999042: The Python compiler now handles explict global statements Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 51420 diff changeset	287 self.emit(prefix + '_GLOBAL', name)
4809afa85a9b Issue #999042: The Python compiler now handles explict global statements Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 51420 diff changeset	288 elif scope == SC_GLOBAL_IMPLICIT:
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	289 if not self.optimized:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	290 self.emit(prefix + '_NAME', name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	291 else:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	292 self.emit(prefix + '_GLOBAL', name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	293 elif scope == SC_FREE or scope == SC_CELL:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	294 self.emit(prefix + '_DEREF', name)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	295 else:
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	296 raise RuntimeError, "unsupported scope for var %s: %d" % \
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	297 (name, scope)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	298
17459 e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	299 def _implicitNameOp(self, prefix, name):
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	300 """Emit name ops for names generated implicitly by for loops
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	301
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	302 The interpreter generates names that start with a period or
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	303 dollar sign. The symbol table ignores these names because
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	304 they aren't present in the program text.
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	305 """
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	306 if self.optimized:
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	307 self.emit(prefix + '_FAST', name)
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	308 else:
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	309 self.emit(prefix + '_NAME', name)
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	310
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	311 # The set_lineno() function and the explicit emit() calls for
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	312 # SET_LINENO below are only used to generate the line number table.
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	313 # As of Python 2.3, the interpreter does not have a SET_LINENO
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	314 # instruction. pyassem treats SET_LINENO opcodes as a special case.
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	315
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	316 def set_lineno(self, node, force=False):
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	317 """Emit SET_LINENO if necessary.
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	318
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	319 The instruction is considered necessary if the node has a
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	320 lineno attribute and it is different than the last lineno
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	321 emitted.
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	322
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	323 Returns true if SET_LINENO was emitted.
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	324
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	325 There are no rules for when an AST node should have a lineno
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	326 attribute. The transformer and AST code need to be reviewed
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	327 and a consistent policy implemented and documented. Until
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	328 then, this method works around missing line numbers.
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	329 """
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	330 lineno = getattr(node, 'lineno', None)
17453 f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	331 if lineno is not None and (lineno != self.last_lineno
f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	332 or force):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	333 self.emit('SET_LINENO', lineno)
14362 a665bdc4922f patch by Neil Schemenauer to improve (fix?) line number generation Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	334 self.last_lineno = lineno
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	335 return True
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	336 return False
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	337
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	338 # The first few visitor methods handle nodes that generator new
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	339 # code objects. They use class attributes to determine what
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	340 # specialized code generators to use.
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	341
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	342 NameFinder = LocalNameFinder
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	343 FunctionGen = None
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	344 ClassGen = None
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	345
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	346 def visitModule(self, node):
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	347 self.scopes = self.parseSymbols(node)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	348 self.scope = self.scopes[node]
17459 e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	349 self.emit('SET_LINENO', 0)
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	350 if node.doc:
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	351 self.emit('LOAD_CONST', node.doc)
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	352 self.storeName('__doc__')
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	353 lnf = walk(node.node, self.NameFinder(), verbose=0)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	354 self.locals.push(lnf.getLocals())
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	355 self.visit(node.node)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	356 self.emit('LOAD_CONST', None)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	357 self.emit('RETURN_VALUE')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	358
21522 cb55f15b2730 Merge of the release22 branch changes back into the trunk. Barry Warsaw <barry@python.org> parents: 21059 diff changeset	359 def visitExpression(self, node):
cb55f15b2730 Merge of the release22 branch changes back into the trunk. Barry Warsaw <barry@python.org> parents: 21059 diff changeset	360 self.set_lineno(node)
cb55f15b2730 Merge of the release22 branch changes back into the trunk. Barry Warsaw <barry@python.org> parents: 21059 diff changeset	361 self.scopes = self.parseSymbols(node)
cb55f15b2730 Merge of the release22 branch changes back into the trunk. Barry Warsaw <barry@python.org> parents: 21059 diff changeset	362 self.scope = self.scopes[node]
cb55f15b2730 Merge of the release22 branch changes back into the trunk. Barry Warsaw <barry@python.org> parents: 21059 diff changeset	363 self.visit(node.node)
cb55f15b2730 Merge of the release22 branch changes back into the trunk. Barry Warsaw <barry@python.org> parents: 21059 diff changeset	364 self.emit('RETURN_VALUE')
cb55f15b2730 Merge of the release22 branch changes back into the trunk. Barry Warsaw <barry@python.org> parents: 21059 diff changeset	365
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	366 def visitFunction(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	367 self._visitFuncOrLambda(node, isLambda=0)
17410 f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	368 if node.doc:
f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	369 self.setDocstring(node.doc)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	370 self.storeName(node.name)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	371
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	372 def visitLambda(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	373 self._visitFuncOrLambda(node, isLambda=1)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	374
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	375 def _visitFuncOrLambda(self, node, isLambda=0):
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32528 diff changeset	376 if not isLambda and node.decorators:
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 33020 diff changeset	377 for decorator in node.decorators.nodes:
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32528 diff changeset	378 self.visit(decorator)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32528 diff changeset	379 ndecorators = len(node.decorators.nodes)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32528 diff changeset	380 else:
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32528 diff changeset	381 ndecorators = 0
33204 c18aca7e81cb Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 33166 diff changeset	382
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	383 gen = self.FunctionGen(node, self.scopes, isLambda,
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	384 self.class_name, self.get_module())
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	385 walk(node.code, gen)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	386 gen.finish()
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	387 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	388 for default in node.defaults:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	389 self.visit(default)
39370 eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	390 self._makeClosure(gen, len(node.defaults))
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32528 diff changeset	391 for i in range(ndecorators):
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32528 diff changeset	392 self.emit('CALL_FUNCTION', 1)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	393
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	394 def visitClass(self, node):
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	395 gen = self.ClassGen(node, self.scopes,
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	396 self.get_module())
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	397 walk(node.code, gen)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	398 gen.finish()
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	399 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	400 self.emit('LOAD_CONST', node.name)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	401 for base in node.bases:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	402 self.visit(base)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	403 self.emit('BUILD_TUPLE', len(node.bases))
39370 eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	404 self._makeClosure(gen, 0)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	405 self.emit('CALL_FUNCTION', 0)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	406 self.emit('BUILD_CLASS')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	407 self.storeName(node.name)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	408
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	409 # The rest are standard visitor methods
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	410
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	411 # The next few implement control-flow statements
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	412
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	413 def visitIf(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	414 end = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	415 numtests = len(node.tests)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	416 for i in range(numtests):
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	417 test, suite = node.tests[i]
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	418 if is_constant_false(test):
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	419 # XXX will need to check generator stuff here
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	420 continue
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	421 self.set_lineno(test)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	422 self.visit(test)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	423 nextTest = self.newBlock()
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	424 self.emit('POP_JUMP_IF_FALSE', nextTest)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	425 self.nextBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	426 self.visit(suite)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	427 self.emit('JUMP_FORWARD', end)
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	428 self.startBlock(nextTest)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	429 if node.else_:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	430 self.visit(node.else_)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	431 self.nextBlock(end)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	432
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	433 def visitWhile(self, node):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	434 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	435
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	436 loop = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	437 else_ = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	438
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	439 after = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	440 self.emit('SETUP_LOOP', after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	441
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	442 self.nextBlock(loop)
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	443 self.setups.push((LOOP, loop))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	444
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	445 self.set_lineno(node, force=True)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	446 self.visit(node.test)
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	447 self.emit('POP_JUMP_IF_FALSE', else_ or after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	448
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	449 self.nextBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	450 self.visit(node.body)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	451 self.emit('JUMP_ABSOLUTE', loop)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	452
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	453 self.startBlock(else_) # or just the POPs if not else clause
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	454 self.emit('POP_BLOCK')
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	455 self.setups.pop()
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	456 if node.else_:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	457 self.visit(node.else_)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	458 self.nextBlock(after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	459
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	460 def visitFor(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	461 start = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	462 anchor = self.newBlock()
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	463 after = self.newBlock()
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	464 self.setups.push((LOOP, start))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	465
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	466 self.set_lineno(node)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	467 self.emit('SETUP_LOOP', after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	468 self.visit(node.list)
19531 deacd60272be Generate FOR_ITER-based loops instead of old FOR_LOOP-based loops Jeremy Hylton <jeremy@alum.mit.edu> parents: 19522 diff changeset	469 self.emit('GET_ITER')
deacd60272be Generate FOR_ITER-based loops instead of old FOR_LOOP-based loops Jeremy Hylton <jeremy@alum.mit.edu> parents: 19522 diff changeset	470
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	471 self.nextBlock(start)
17460 99c471ced170 Pop loop off the loop stack before handling the loop's else clause. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17459 diff changeset	472 self.set_lineno(node, force=1)
19531 deacd60272be Generate FOR_ITER-based loops instead of old FOR_LOOP-based loops Jeremy Hylton <jeremy@alum.mit.edu> parents: 19522 diff changeset	473 self.emit('FOR_ITER', anchor)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	474 self.visit(node.assign)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	475 self.visit(node.body)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	476 self.emit('JUMP_ABSOLUTE', start)
19534 de10151a7f63 Make sure the JUMP_ABSOLUTE and POP_BLOCK at the end of a for loop are Jeremy Hylton <jeremy@alum.mit.edu> parents: 19531 diff changeset	477 self.nextBlock(anchor)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	478 self.emit('POP_BLOCK')
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	479 self.setups.pop()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	480 if node.else_:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	481 self.visit(node.else_)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	482 self.nextBlock(after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	483
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	484 def visitBreak(self, node):
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	485 if not self.setups:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	486 raise SyntaxError, "'break' outside loop (%s, %d)" % \
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	487 (node.filename, node.lineno)
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	488 self.set_lineno(node)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	489 self.emit('BREAK_LOOP')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	490
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	491 def visitContinue(self, node):
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	492 if not self.setups:
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	493 raise SyntaxError, "'continue' outside loop (%s, %d)" % \
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	494 (node.filename, node.lineno)
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	495 kind, block = self.setups.top()
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	496 if kind == LOOP:
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	497 self.set_lineno(node)
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	498 self.emit('JUMP_ABSOLUTE', block)
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	499 self.nextBlock()
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	500 elif kind == EXCEPT or kind == TRY_FINALLY:
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	501 self.set_lineno(node)
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	502 # find the block that starts the loop
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	503 top = len(self.setups)
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	504 while top > 0:
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	505 top = top - 1
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	506 kind, loop_block = self.setups[top]
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	507 if kind == LOOP:
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	508 break
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	509 if kind != LOOP:
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	510 raise SyntaxError, "'continue' outside loop (%s, %d)" % \
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	511 (node.filename, node.lineno)
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	512 self.emit('CONTINUE_LOOP', loop_block)
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	513 self.nextBlock()
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	514 elif kind == END_FINALLY:
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	515 msg = "'continue' not allowed inside 'finally' clause (%s, %d)"
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	516 raise SyntaxError, msg % (node.filename, node.lineno)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	517
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	518 def visitTest(self, node, jump):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	519 end = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	520 for child in node.nodes[:-1]:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	521 self.visit(child)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	522 self.emit(jump, end)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	523 self.nextBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	524 self.visit(node.nodes[-1])
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	525 self.nextBlock(end)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	526
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	527 def visitAnd(self, node):
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	528 self.visitTest(node, 'JUMP_IF_FALSE_OR_POP')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	529
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	530 def visitOr(self, node):
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	531 self.visitTest(node, 'JUMP_IF_TRUE_OR_POP')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	532
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	533 def visitIfExp(self, node):
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	534 endblock = self.newBlock()
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	535 elseblock = self.newBlock()
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	536 self.visit(node.test)
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	537 self.emit('POP_JUMP_IF_FALSE', elseblock)
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	538 self.visit(node.then)
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	539 self.emit('JUMP_FORWARD', endblock)
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	540 self.nextBlock(elseblock)
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	541 self.visit(node.else_)
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	542 self.nextBlock(endblock)
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	543
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	544 def visitCompare(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	545 self.visit(node.expr)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	546 cleanup = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	547 for op, code in node.ops[:-1]:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	548 self.visit(code)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	549 self.emit('DUP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	550 self.emit('ROT_THREE')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	551 self.emit('COMPARE_OP', op)
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	552 self.emit('JUMP_IF_FALSE_OR_POP', cleanup)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	553 self.nextBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	554 # now do the last comparison
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	555 if node.ops:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	556 op, code = node.ops[-1]
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	557 self.visit(code)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	558 self.emit('COMPARE_OP', op)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	559 if len(node.ops) > 1:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	560 end = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	561 self.emit('JUMP_FORWARD', end)
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	562 self.startBlock(cleanup)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	563 self.emit('ROT_TWO')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	564 self.emit('POP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	565 self.nextBlock(end)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	566
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	567 # list comprehensions
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	568 def visitListComp(self, node):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	569 self.set_lineno(node)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	570 # setup list
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	571 self.emit('BUILD_LIST', 0)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	572
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	573 stack = []
17453 f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	574 for i, for_ in zip(range(len(node.quals)), node.quals):
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	575 start, anchor = self.visit(for_)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	576 cont = None
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	577 for if_ in for_.ifs:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	578 if cont is None:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	579 cont = self.newBlock()
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	580 self.visit(if_, cont)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	581 stack.insert(0, (start, cont, anchor))
17453 f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	582
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	583 self.visit(node.expr)
50204 94e79d78dff0 Issue #2183: Simplify and optimize bytecode for list comprehensions. Antoine Pitrou <solipsis@pitrou.net> parents: 45897 diff changeset	584 self.emit('LIST_APPEND', len(node.quals) + 1)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	585
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	586 for start, cont, anchor in stack:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	587 if cont:
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	588 self.nextBlock(cont)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	589 self.emit('JUMP_ABSOLUTE', start)
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	590 self.startBlock(anchor)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	591
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	592 def visitListCompFor(self, node):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	593 start = self.newBlock()
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	594 anchor = self.newBlock()
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	595
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	596 self.visit(node.list)
19619 5663b883ea5d Fix _convert_NAME() so that it doesn't store locals for class bodies. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19609 diff changeset	597 self.emit('GET_ITER')
17459 e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	598 self.nextBlock(start)
26983 2c67169f6e13 Replace all but one explicit emit('SET_LINENO') with call to set_lineno(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 26979 diff changeset	599 self.set_lineno(node, force=True)
19619 5663b883ea5d Fix _convert_NAME() so that it doesn't store locals for class bodies. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19609 diff changeset	600 self.emit('FOR_ITER', anchor)
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	601 self.nextBlock()
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	602 self.visit(node.assign)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	603 return start, anchor
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	604
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	605 def visitListCompIf(self, node, branch):
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	606 self.set_lineno(node, force=True)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	607 self.visit(node.test)
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	608 self.emit('POP_JUMP_IF_FALSE', branch)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	609 self.newBlock()
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	610
39370 eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	611 def _makeClosure(self, gen, args):
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	612 frees = gen.scope.get_free_vars()
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	613 if frees:
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	614 for name in frees:
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	615 self.emit('LOAD_CLOSURE', name)
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	616 self.emit('BUILD_TUPLE', len(frees))
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	617 self.emit('LOAD_CONST', gen)
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	618 self.emit('MAKE_CLOSURE', args)
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	619 else:
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	620 self.emit('LOAD_CONST', gen)
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	621 self.emit('MAKE_FUNCTION', args)
eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	622
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	623 def visitGenExpr(self, node):
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	624 gen = GenExprCodeGenerator(node, self.scopes, self.class_name,
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	625 self.get_module())
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	626 walk(node.code, gen)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	627 gen.finish()
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	628 self.set_lineno(node)
39370 eb23d096d694 Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 38084 diff changeset	629 self._makeClosure(gen, 0)
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	630 # precomputation of outmost iterable
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	631 self.visit(node.code.quals[0].iter)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	632 self.emit('GET_ITER')
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	633 self.emit('CALL_FUNCTION', 1)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	634
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	635 def visitGenExprInner(self, node):
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	636 self.set_lineno(node)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	637 # setup list
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	638
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	639 stack = []
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	640 for i, for_ in zip(range(len(node.quals)), node.quals):
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	641 start, anchor, end = self.visit(for_)
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	642 cont = None
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	643 for if_ in for_.ifs:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	644 if cont is None:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	645 cont = self.newBlock()
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	646 self.visit(if_, cont)
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	647 stack.insert(0, (start, cont, anchor, end))
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	648
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	649 self.visit(node.expr)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	650 self.emit('YIELD_VALUE')
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	651 self.emit('POP_TOP')
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	652
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	653 for start, cont, anchor, end in stack:
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	654 if cont:
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	655 self.nextBlock(cont)
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	656 self.emit('JUMP_ABSOLUTE', start)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	657 self.startBlock(anchor)
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	658 self.emit('POP_BLOCK')
a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	659 self.setups.pop()
51404 42faa8054c3d Overhaul Lib/compiler block ordering. The previous code was filled with Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 50204 diff changeset	660 self.nextBlock(end)
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	661
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	662 self.emit('LOAD_CONST', None)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	663
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	664 def visitGenExprFor(self, node):
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	665 start = self.newBlock()
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	666 anchor = self.newBlock()
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	667 end = self.newBlock()
a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	668
a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	669 self.setups.push((LOOP, start))
a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	670 self.emit('SETUP_LOOP', end)
32528 67539cfcf09f Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 32121 diff changeset	671
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	672 if node.is_outmost:
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	673 self.loadName('.0')
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	674 else:
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	675 self.visit(node.iter)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	676 self.emit('GET_ITER')
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	677
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	678 self.nextBlock(start)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	679 self.set_lineno(node, force=True)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	680 self.emit('FOR_ITER', anchor)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	681 self.nextBlock()
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	682 self.visit(node.assign)
39532 a6afe0eda711 Fix a bug in the ``compiler`` package that caused invalid code to be Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39370 diff changeset	683 return start, anchor, end
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	684
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	685 def visitGenExprIf(self, node, branch):
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	686 self.set_lineno(node, force=True)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	687 self.visit(node.test)
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	688 self.emit('POP_JUMP_IF_FALSE', branch)
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	689 self.newBlock()
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	690
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	691 # exception related
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	692
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	693 def visitAssert(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	694 # XXX would be interesting to implement this via a
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	695 # transformation of the AST before this stage
33020 ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	696 if __debug__:
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	697 end = self.newBlock()
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	698 self.set_lineno(node)
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	699 # XXX AssertionError appears to be special case -- it is always
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	700 # loaded as a global even if there is a local name. I guess this
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	701 # is a sort of renaming op.
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	702 self.nextBlock()
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	703 self.visit(node.test)
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	704 self.emit('POP_JUMP_IF_TRUE', end)
33020 ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	705 self.nextBlock()
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	706 self.emit('LOAD_GLOBAL', 'AssertionError')
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	707 if node.fail:
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	708 self.visit(node.fail)
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	709 self.emit('RAISE_VARARGS', 2)
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	710 else:
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	711 self.emit('RAISE_VARARGS', 1)
ad818338f8c3 SF patch 836879. Jeremy Hylton <jeremy@alum.mit.edu> parents: 32949 diff changeset	712 self.nextBlock(end)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	713
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	714 def visitRaise(self, node):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	715 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	716 n = 0
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	717 if node.expr1:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	718 self.visit(node.expr1)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	719 n = n + 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	720 if node.expr2:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	721 self.visit(node.expr2)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	722 n = n + 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	723 if node.expr3:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	724 self.visit(node.expr3)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	725 n = n + 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	726 self.emit('RAISE_VARARGS', n)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	727
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	728 def visitTryExcept(self, node):
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	729 body = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	730 handlers = self.newBlock()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	731 end = self.newBlock()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	732 if node.else_:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	733 lElse = self.newBlock()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	734 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	735 lElse = end
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	736 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	737 self.emit('SETUP_EXCEPT', handlers)
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	738 self.nextBlock(body)
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	739 self.setups.push((EXCEPT, body))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	740 self.visit(node.body)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	741 self.emit('POP_BLOCK')
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	742 self.setups.pop()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	743 self.emit('JUMP_FORWARD', lElse)
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	744 self.startBlock(handlers)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	745
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	746 last = len(node.handlers) - 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	747 for i in range(len(node.handlers)):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	748 expr, target, body = node.handlers[i]
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	749 self.set_lineno(expr)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	750 if expr:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	751 self.emit('DUP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	752 self.visit(expr)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	753 self.emit('COMPARE_OP', 'exception match')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	754 next = self.newBlock()
51920 ef8fe9088696 Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with Jeffrey Yasskin <jyasskin@gmail.com> parents: 51425 diff changeset	755 self.emit('POP_JUMP_IF_FALSE', next)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	756 self.nextBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	757 self.emit('POP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	758 if target:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	759 self.visit(target)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	760 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	761 self.emit('POP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	762 self.emit('POP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	763 self.visit(body)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	764 self.emit('JUMP_FORWARD', end)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	765 if expr:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	766 self.nextBlock(next)
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	767 else:
7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	768 self.nextBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	769 self.emit('END_FINALLY')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	770 if node.else_:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	771 self.nextBlock(lElse)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	772 self.visit(node.else_)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	773 self.nextBlock(end)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	774
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	775 def visitTryFinally(self, node):
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	776 body = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	777 final = self.newBlock()
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	778 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	779 self.emit('SETUP_FINALLY', final)
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	780 self.nextBlock(body)
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	781 self.setups.push((TRY_FINALLY, body))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	782 self.visit(node.body)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	783 self.emit('POP_BLOCK')
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	784 self.setups.pop()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	785 self.emit('LOAD_CONST', None)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	786 self.nextBlock(final)
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	787 self.setups.push((END_FINALLY, final))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	788 self.visit(node.final)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	789 self.emit('END_FINALLY')
19573 725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	790 self.setups.pop()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	791
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	792 __with_count = 0
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	793
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	794 def visitWith(self, node):
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	795 body = self.newBlock()
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	796 final = self.newBlock()
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	797 self.__with_count += 1
51420 0151c514df56 Make names generated for 'with' variables match the built-in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 51404 diff changeset	798 valuevar = "_[%d]" % self.__with_count
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	799 self.set_lineno(node)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	800 self.visit(node.expr)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	801 self.emit('DUP_TOP')
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	802 self.emit('LOAD_ATTR', '__exit__')
45703 343597c7d682 Speed up with statements by storing the __exit__ method on the stack instead of in a temp variable (bumps the magic number for pyc files) Nick Coghlan <ncoghlan@gmail.com> parents: 40719 diff changeset	803 self.emit('ROT_TWO')
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	804 self.emit('LOAD_ATTR', '__enter__')
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	805 self.emit('CALL_FUNCTION', 0)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	806 if node.vars is None:
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	807 self.emit('POP_TOP')
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	808 else:
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	809 self._implicitNameOp('STORE', valuevar)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	810 self.emit('SETUP_FINALLY', final)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	811 self.nextBlock(body)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	812 self.setups.push((TRY_FINALLY, body))
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	813 if node.vars is not None:
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	814 self._implicitNameOp('LOAD', valuevar)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	815 self._implicitNameOp('DELETE', valuevar)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	816 self.visit(node.vars)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	817 self.visit(node.body)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	818 self.emit('POP_BLOCK')
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	819 self.setups.pop()
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	820 self.emit('LOAD_CONST', None)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	821 self.nextBlock(final)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	822 self.setups.push((END_FINALLY, final))
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	823 self.emit('WITH_CLEANUP')
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	824 self.emit('END_FINALLY')
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	825 self.setups.pop()
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	826 self.__with_count -= 1
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 35946 diff changeset	827
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	828 # misc
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	829
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	830 def visitDiscard(self, node):
17412 3704be3db302 [finishing fix from earlier checkins] Jeremy Hylton <jeremy@alum.mit.edu> parents: 17410 diff changeset	831 self.set_lineno(node)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	832 self.visit(node.expr)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	833 self.emit('POP_TOP')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	834
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	835 def visitConst(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	836 self.emit('LOAD_CONST', node.value)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	837
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	838 def visitKeyword(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	839 self.emit('LOAD_CONST', node.name)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	840 self.visit(node.expr)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	841
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	842 def visitGlobal(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	843 # no code to generate
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	844 pass
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	845
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	846 def visitName(self, node):
14362 a665bdc4922f patch by Neil Schemenauer to improve (fix?) line number generation Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	847 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	848 self.loadName(node.name)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	849
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	850 def visitPass(self, node):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	851 self.set_lineno(node)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	852
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	853 def visitImport(self, node):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	854 self.set_lineno(node)
36823 7a6b174ddef2 Fix compiler breakage related to absolute imports Neal Norwitz <nnorwitz@gmail.com> parents: 36821 diff changeset	855 level = 0 if self.graph.checkFlag(CO_FUTURE_ABSIMPORT) else -1
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	856 for name, alias in node.names:
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	857 if VERSION > 1:
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	858 self.emit('LOAD_CONST', level)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	859 self.emit('LOAD_CONST', None)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	860 self.emit('IMPORT_NAME', name)
23710 44b9977d4848 Remove uses of string module and stat.ST_MODE Neal Norwitz <nnorwitz@gmail.com> parents: 21958 diff changeset	861 mod = name.split(".")[0]
29602 caa8c120e2cb Jacob Hallen cornered me here at EuroPython and got me to look at Michael W. Hudson <mwh@python.net> parents: 26983 diff changeset	862 if alias:
caa8c120e2cb Jacob Hallen cornered me here at EuroPython and got me to look at Michael W. Hudson <mwh@python.net> parents: 26983 diff changeset	863 self._resolveDots(name)
caa8c120e2cb Jacob Hallen cornered me here at EuroPython and got me to look at Michael W. Hudson <mwh@python.net> parents: 26983 diff changeset	864 self.storeName(alias)
caa8c120e2cb Jacob Hallen cornered me here at EuroPython and got me to look at Michael W. Hudson <mwh@python.net> parents: 26983 diff changeset	865 else:
caa8c120e2cb Jacob Hallen cornered me here at EuroPython and got me to look at Michael W. Hudson <mwh@python.net> parents: 26983 diff changeset	866 self.storeName(mod)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	867
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	868 def visitFrom(self, node):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	869 self.set_lineno(node)
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	870 level = node.level
36823 7a6b174ddef2 Fix compiler breakage related to absolute imports Neal Norwitz <nnorwitz@gmail.com> parents: 36821 diff changeset	871 if level == 0 and not self.graph.checkFlag(CO_FUTURE_ABSIMPORT):
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	872 level = -1
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	873 fromlist = map(lambda (name, alias): name, node.names)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	874 if VERSION > 1:
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36706 diff changeset	875 self.emit('LOAD_CONST', level)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	876 self.emit('LOAD_CONST', tuple(fromlist))
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	877 self.emit('IMPORT_NAME', node.modname)
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	878 for name, alias in node.names:
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	879 if VERSION > 1:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	880 if name == '*':
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	881 self.namespace = 0
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	882 self.emit('IMPORT_STAR')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	883 # There can only be one name w/ from ... import *
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	884 assert len(node.names) == 1
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	885 return
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	886 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	887 self.emit('IMPORT_FROM', name)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	888 self._resolveDots(name)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	889 self.storeName(alias or name)
15185 100beebde9df Fix SF bug #116263: support for from .. import * Jeremy Hylton <jeremy@alum.mit.edu> parents: 14362 diff changeset	890 else:
100beebde9df Fix SF bug #116263: support for from .. import * Jeremy Hylton <jeremy@alum.mit.edu> parents: 14362 diff changeset	891 self.emit('IMPORT_FROM', name)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	892 self.emit('POP_TOP')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	893
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	894 def _resolveDots(self, name):
23710 44b9977d4848 Remove uses of string module and stat.ST_MODE Neal Norwitz <nnorwitz@gmail.com> parents: 21958 diff changeset	895 elts = name.split(".")
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	896 if len(elts) == 1:
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	897 return
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	898 for elt in elts[1:]:
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	899 self.emit('LOAD_ATTR', elt)
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	900
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	901 def visitGetattr(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	902 self.visit(node.expr)
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	903 self.emit('LOAD_ATTR', self.mangle(node.attrname))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	904
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	905 # next five implement assignments
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	906
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	907 def visitAssign(self, node):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	908 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	909 self.visit(node.expr)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	910 dups = len(node.nodes) - 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	911 for i in range(len(node.nodes)):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	912 elt = node.nodes[i]
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	913 if i < dups:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	914 self.emit('DUP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	915 if isinstance(elt, ast.Node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	916 self.visit(elt)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	917
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	918 def visitAssName(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	919 if node.flags == 'OP_ASSIGN':
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	920 self.storeName(node.name)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	921 elif node.flags == 'OP_DELETE':
19561 81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	922 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	923 self.delName(node.name)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	924 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	925 print "oops", node.flags
11754 dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	926
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	927 def visitAssAttr(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	928 self.visit(node.expr)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	929 if node.flags == 'OP_ASSIGN':
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	930 self.emit('STORE_ATTR', self.mangle(node.attrname))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	931 elif node.flags == 'OP_DELETE':
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	932 self.emit('DELETE_ATTR', self.mangle(node.attrname))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	933 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	934 print "warning: unexpected flags:", node.flags
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	935 print node
11751 3f1da05ced55 add support for Lambda nodes Jeremy Hylton <jeremy@alum.mit.edu> parents: 11748 diff changeset	936
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	937 def _visitAssSequence(self, node, op='UNPACK_SEQUENCE'):
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	938 if findOp(node) != 'OP_DELETE':
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	939 self.emit(op, len(node.nodes))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	940 for child in node.nodes:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	941 self.visit(child)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	942
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	943 if VERSION > 1:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	944 visitAssTuple = _visitAssSequence
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	945 visitAssList = _visitAssSequence
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	946 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	947 def visitAssTuple(self, node):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	948 self._visitAssSequence(node, 'UNPACK_TUPLE')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	949
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	950 def visitAssList(self, node):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	951 self._visitAssSequence(node, 'UNPACK_LIST')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	952
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	953 # augmented assignment
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	954
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	955 def visitAugAssign(self, node):
19519 99e953c6709c emit SET_LINENO for augmented assignments Jeremy Hylton <jeremy@alum.mit.edu> parents: 19518 diff changeset	956 self.set_lineno(node)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	957 aug_node = wrap_aug(node.node)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	958 self.visit(aug_node, "load")
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	959 self.visit(node.expr)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	960 self.emit(self._augmented_opcode[node.op])
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	961 self.visit(aug_node, "store")
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	962
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	963 _augmented_opcode = {
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	964 '+=' : 'INPLACE_ADD',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	965 '-=' : 'INPLACE_SUBTRACT',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	966 '*=' : 'INPLACE_MULTIPLY',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	967 '/=' : 'INPLACE_DIVIDE',
19561 81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	968 '//=': 'INPLACE_FLOOR_DIVIDE',
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	969 '%=' : 'INPLACE_MODULO',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	970 '**=': 'INPLACE_POWER',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	971 '>>=': 'INPLACE_RSHIFT',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	972 '<<=': 'INPLACE_LSHIFT',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	973 '&=' : 'INPLACE_AND',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	974 '^=' : 'INPLACE_XOR',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	975 '\|=' : 'INPLACE_OR',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	976 }
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	977
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	978 def visitAugName(self, node, mode):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	979 if mode == "load":
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	980 self.loadName(node.name)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	981 elif mode == "store":
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	982 self.storeName(node.name)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	983
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	984 def visitAugGetattr(self, node, mode):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	985 if mode == "load":
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	986 self.visit(node.expr)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	987 self.emit('DUP_TOP')
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	988 self.emit('LOAD_ATTR', self.mangle(node.attrname))
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	989 elif mode == "store":
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	990 self.emit('ROT_TWO')
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	991 self.emit('STORE_ATTR', self.mangle(node.attrname))
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	992
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	993 def visitAugSlice(self, node, mode):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	994 if mode == "load":
17413 bad2daeb7440 typo Jeremy Hylton <jeremy@alum.mit.edu> parents: 17412 diff changeset	995 self.visitSlice(node, 1)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	996 elif mode == "store":
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	997 slice = 0
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	998 if node.lower:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	999 slice = slice \| 1
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1000 if node.upper:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1001 slice = slice \| 2
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1002 if slice == 0:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1003 self.emit('ROT_TWO')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1004 elif slice == 3:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1005 self.emit('ROT_FOUR')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1006 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1007 self.emit('ROT_THREE')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1008 self.emit('STORE_SLICE+%d' % slice)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1009
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1010 def visitAugSubscript(self, node, mode):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1011 if mode == "load":
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1012 self.visitSubscript(node, 1)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1013 elif mode == "store":
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1014 self.emit('ROT_THREE')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1015 self.emit('STORE_SUBSCR')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1016
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1017 def visitExec(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1018 self.visit(node.expr)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1019 if node.locals is None:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1020 self.emit('LOAD_CONST', None)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1021 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1022 self.visit(node.locals)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1023 if node.globals is None:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1024 self.emit('DUP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1025 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1026 self.visit(node.globals)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1027 self.emit('EXEC_STMT')
11751 3f1da05ced55 add support for Lambda nodes Jeremy Hylton <jeremy@alum.mit.edu> parents: 11748 diff changeset	1028
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1029 def visitCallFunc(self, node):
11754 dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	1030 pos = 0
dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	1031 kw = 0
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	1032 self.set_lineno(node)
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1033 self.visit(node.node)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1034 for arg in node.args:
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1035 self.visit(arg)
11754 dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	1036 if isinstance(arg, ast.Keyword):
dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	1037 kw = kw + 1
dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	1038 else:
dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	1039 pos = pos + 1
12563 b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	1040 if node.star_args is not None:
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	1041 self.visit(node.star_args)
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	1042 if node.dstar_args is not None:
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	1043 self.visit(node.dstar_args)
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	1044 have_star = node.star_args is not None
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	1045 have_dstar = node.dstar_args is not None
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	1046 opcode = callfunc_opcode_info[have_star, have_dstar]
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	1047 self.emit(opcode, kw << 8 \| pos)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1048
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1049 def visitPrint(self, node, newline=0):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	1050 self.set_lineno(node)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1051 if node.dest:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1052 self.visit(node.dest)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1053 for child in node.nodes:
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1054 if node.dest:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1055 self.emit('DUP_TOP')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1056 self.visit(child)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1057 if node.dest:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1058 self.emit('ROT_TWO')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1059 self.emit('PRINT_ITEM_TO')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1060 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1061 self.emit('PRINT_ITEM')
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1062 if node.dest and not newline:
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1063 self.emit('POP_TOP')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1064
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1065 def visitPrintnl(self, node):
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1066 self.visitPrint(node, newline=1)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1067 if node.dest:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1068 self.emit('PRINT_NEWLINE_TO')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1069 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1070 self.emit('PRINT_NEWLINE')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1071
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1072 def visitReturn(self, node):
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	1073 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1074 self.visit(node.value)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1075 self.emit('RETURN_VALUE')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1076
19923 cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	1077 def visitYield(self, node):
cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	1078 self.set_lineno(node)
cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	1079 self.visit(node.value)
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1080 self.emit('YIELD_VALUE')
19923 cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	1081
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1082 # slice and subscript stuff
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1083
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1084 def visitSlice(self, node, aug_flag=None):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1085 # aug_flag is used by visitAugSlice
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1086 self.visit(node.expr)
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1087 slice = 0
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1088 if node.lower:
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1089 self.visit(node.lower)
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1090 slice = slice \| 1
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1091 if node.upper:
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1092 self.visit(node.upper)
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1093 slice = slice \| 2
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1094 if aug_flag:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1095 if slice == 0:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1096 self.emit('DUP_TOP')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1097 elif slice == 3:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1098 self.emit('DUP_TOPX', 3)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1099 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1100 self.emit('DUP_TOPX', 2)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1101 if node.flags == 'OP_APPLY':
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1102 self.emit('SLICE+%d' % slice)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1103 elif node.flags == 'OP_ASSIGN':
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1104 self.emit('STORE_SLICE+%d' % slice)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1105 elif node.flags == 'OP_DELETE':
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1106 self.emit('DELETE_SLICE+%d' % slice)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1107 else:
11789 860524182b9c finish first impl of code generator Jeremy Hylton <jeremy@alum.mit.edu> parents: 11766 diff changeset	1108 print "weird slice", node.flags
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1109 raise
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1110
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1111 def visitSubscript(self, node, aug_flag=None):
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1112 self.visit(node.expr)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1113 for sub in node.subs:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1114 self.visit(sub)
36980 c8ffc913d014 Teach the compiler module about augmented assignment to tuple subscripts Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	1115 if len(node.subs) > 1:
c8ffc913d014 Teach the compiler module about augmented assignment to tuple subscripts Nick Coghlan <ncoghlan@gmail.com> parents: 36926 diff changeset	1116 self.emit('BUILD_TUPLE', len(node.subs))
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1117 if aug_flag:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1118 self.emit('DUP_TOPX', 2)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1119 if node.flags == 'OP_APPLY':
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1120 self.emit('BINARY_SUBSCR')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1121 elif node.flags == 'OP_ASSIGN':
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1122 self.emit('STORE_SUBSCR')
11808 cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1123 elif node.flags == 'OP_DELETE':
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1124 self.emit('DELETE_SUBSCR')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1125
11927 79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1126 # binary ops
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1127
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1128 def binaryOp(self, node, op):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1129 self.visit(node.left)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1130 self.visit(node.right)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1131 self.emit(op)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1132
d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1133 def visitAdd(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1134 return self.binaryOp(node, 'BINARY_ADD')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1135
d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1136 def visitSub(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1137 return self.binaryOp(node, 'BINARY_SUBTRACT')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1138
d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1139 def visitMul(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1140 return self.binaryOp(node, 'BINARY_MULTIPLY')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1141
d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142 def visitDiv(self, node):
19936 6944f5b9de03 support true division Jeremy Hylton <jeremy@alum.mit.edu> parents: 19923 diff changeset	1143 return self.binaryOp(node, self._div_op)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1144
19561 81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	1145 def visitFloorDiv(self, node):
81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	1146 return self.binaryOp(node, 'BINARY_FLOOR_DIVIDE')
81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	1147
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1148 def visitMod(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1149 return self.binaryOp(node, 'BINARY_MODULO')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1150
11761 62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1151 def visitPower(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1152 return self.binaryOp(node, 'BINARY_POWER')
11761 62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1153
62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1154 def visitLeftShift(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1155 return self.binaryOp(node, 'BINARY_LSHIFT')
11761 62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1156
62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1157 def visitRightShift(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1158 return self.binaryOp(node, 'BINARY_RSHIFT')
11761 62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1159
11927 79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1160 # unary ops
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1161
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1162 def unaryOp(self, node, op):
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1163 self.visit(node.expr)
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1164 self.emit(op)
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1165
11761 62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1166 def visitInvert(self, node):
62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1167 return self.unaryOp(node, 'UNARY_INVERT')
62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1168
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1169 def visitUnarySub(self, node):
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1170 return self.unaryOp(node, 'UNARY_NEGATIVE')
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1171
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1172 def visitUnaryAdd(self, node):
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1173 return self.unaryOp(node, 'UNARY_POSITIVE')
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1174
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1175 def visitUnaryInvert(self, node):
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1176 return self.unaryOp(node, 'UNARY_INVERT')
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1177
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1178 def visitNot(self, node):
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1179 return self.unaryOp(node, 'UNARY_NOT')
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1180
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1181 def visitBackquote(self, node):
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1182 return self.unaryOp(node, 'UNARY_CONVERT')
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1183
11927 79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1184 # bit ops
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1185
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1186 def bitOp(self, nodes, op):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1187 self.visit(nodes[0])
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1188 for node in nodes[1:]:
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1189 self.visit(node)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1190 self.emit(op)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1191
57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1192 def visitBitand(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1193 return self.bitOp(node.nodes, 'BINARY_AND')
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1194
57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1195 def visitBitor(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1196 return self.bitOp(node.nodes, 'BINARY_OR')
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1197
57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1198 def visitBitxor(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1199 return self.bitOp(node.nodes, 'BINARY_XOR')
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1200
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1201 # object constructors
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1202
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1203 def visitEllipsis(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1204 self.emit('LOAD_CONST', Ellipsis)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1205
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1206 def visitTuple(self, node):
19567 b98e4346257b Generate SET_LINENO for list and tuple literals when the open paren Jeremy Hylton <jeremy@alum.mit.edu> parents: 19561 diff changeset	1207 self.set_lineno(node)
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1208 for elt in node.nodes:
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1209 self.visit(elt)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1210 self.emit('BUILD_TUPLE', len(node.nodes))
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1211
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1212 def visitList(self, node):
19567 b98e4346257b Generate SET_LINENO for list and tuple literals when the open paren Jeremy Hylton <jeremy@alum.mit.edu> parents: 19561 diff changeset	1213 self.set_lineno(node)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1214 for elt in node.nodes:
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1215 self.visit(elt)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1216 self.emit('BUILD_LIST', len(node.nodes))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1217
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1218 def visitSliceobj(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1219 for child in node.nodes:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1220 self.visit(child)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1221 self.emit('BUILD_SLICE', len(node.nodes))
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1222
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1223 def visitDict(self, node):
26983 2c67169f6e13 Replace all but one explicit emit('SET_LINENO') with call to set_lineno(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 26979 diff changeset	1224 self.set_lineno(node)
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1225 self.emit('BUILD_MAP', 0)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1226 for k, v in node.items:
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1227 self.emit('DUP_TOP')
26670 1312297887a3 Fixing bug Gustavo Niemeyer <gustavo@niemeyer.net> parents: 23710 diff changeset	1228 self.visit(k)
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1229 self.visit(v)
26670 1312297887a3 Fixing bug Gustavo Niemeyer <gustavo@niemeyer.net> parents: 23710 diff changeset	1230 self.emit('ROT_THREE')
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1231 self.emit('STORE_SUBSCR')
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1232
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1233 class NestedScopeMixin:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1234 """Defines initClass() for nested scoping (Python 2.2-compatible)"""
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1235 def initClass(self):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1236 self.__class__.NameFinder = LocalNameFinder
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1237 self.__class__.FunctionGen = FunctionCodeGenerator
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1238 self.__class__.ClassGen = ClassCodeGenerator
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1239
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1240 class ModuleCodeGenerator(NestedScopeMixin, CodeGenerator):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1241 __super_init = CodeGenerator.__init__
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1242
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1243 scopes = None
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1244
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1245 def __init__(self, tree):
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1246 self.graph = pyassem.PyFlowGraph("<module>", tree.filename)
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1247 self.futures = future.find_futures(tree)
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1248 self.__super_init()
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1249 walk(tree, self)
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1250
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1251 def get_module(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1252 return self
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1253
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1254 class ExpressionCodeGenerator(NestedScopeMixin, CodeGenerator):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1255 __super_init = CodeGenerator.__init__
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1256
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1257 scopes = None
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1258 futures = ()
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1259
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1260 def __init__(self, tree):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1261 self.graph = pyassem.PyFlowGraph("<expression>", tree.filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1262 self.__super_init()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1263 walk(tree, self)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1264
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1265 def get_module(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1266 return self
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1267
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1268 class InteractiveCodeGenerator(NestedScopeMixin, CodeGenerator):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1269
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1270 __super_init = CodeGenerator.__init__
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1271
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1272 scopes = None
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1273 futures = ()
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1274
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1275 def __init__(self, tree):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1276 self.graph = pyassem.PyFlowGraph("<interactive>", tree.filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1277 self.__super_init()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1278 self.set_lineno(tree)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1279 walk(tree, self)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1280 self.emit('RETURN_VALUE')
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1281
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1282 def get_module(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1283 return self
21958 5ed782bdbb2a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 21522 diff changeset	1284
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1285 def visitDiscard(self, node):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1286 # XXX Discard means it's an expression. Perhaps this is a bad
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1287 # name.
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1288 self.visit(node.expr)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1289 self.emit('PRINT_EXPR')
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1290
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1291 class AbstractFunctionCode:
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1292 optimized = 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1293 lambdaCount = 0
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1294
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1295 def __init__(self, func, scopes, isLambda, class_name, mod):
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	1296 self.class_name = class_name
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1297 self.module = mod
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1298 if isLambda:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1299 klass = FunctionCodeGenerator
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1300 name = "<lambda.%d>" % klass.lambdaCount
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1301 klass.lambdaCount = klass.lambdaCount + 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1302 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1303 name = func.name
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1304
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1305 args, hasTupleArg = generateArgList(func.argnames)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1306 self.graph = pyassem.PyFlowGraph(name, func.filename, args,
a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1307 optimized=1)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1308 self.isLambda = isLambda
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1309 self.super_init()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1310
17410 f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1311 if not isLambda and func.doc:
f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1312 self.setDocstring(func.doc)
f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1313
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1314 lnf = walk(func.code, self.NameFinder(args), verbose=0)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1315 self.locals.push(lnf.getLocals())
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1316 if func.varargs:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1317 self.graph.setFlag(CO_VARARGS)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1318 if func.kwargs:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1319 self.graph.setFlag(CO_VARKEYWORDS)
13864 c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	1320 self.set_lineno(func)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1321 if hasTupleArg:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1322 self.generateArgUnpack(func.argnames)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1323
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1324 def get_module(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1325 return self.module
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1326
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1327 def finish(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1328 self.graph.startExitBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1329 if not self.isLambda:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1330 self.emit('LOAD_CONST', None)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1331 self.emit('RETURN_VALUE')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1332
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1333 def generateArgUnpack(self, args):
17449 51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1334 for i in range(len(args)):
51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1335 arg = args[i]
35946 b2eb1589c22b No need for types, use isinstance Neal Norwitz <nnorwitz@gmail.com> parents: 33204 diff changeset	1336 if isinstance(arg, tuple):
17449 51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1337 self.emit('LOAD_FAST', '.%d' % (i * 2))
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1338 self.unpackSequence(arg)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1339
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1340 def unpackSequence(self, tup):
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1341 if VERSION > 1:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1342 self.emit('UNPACK_SEQUENCE', len(tup))
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1343 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1344 self.emit('UNPACK_TUPLE', len(tup))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1345 for elt in tup:
35946 b2eb1589c22b No need for types, use isinstance Neal Norwitz <nnorwitz@gmail.com> parents: 33204 diff changeset	1346 if isinstance(elt, tuple):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1347 self.unpackSequence(elt)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1348 else:
17438 41a423294cb5 Fix unpackSequence() to use _nameOp() rather than LOAD_FAST Jeremy Hylton <jeremy@alum.mit.edu> parents: 17437 diff changeset	1349 self._nameOp('STORE', elt)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1350
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1351 unpackTuple = unpackSequence
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1352
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1353 class FunctionCodeGenerator(NestedScopeMixin, AbstractFunctionCode,
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1354 CodeGenerator):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1355 super_init = CodeGenerator.__init__ # call be other init
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1356 scopes = None
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1357
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1358 __super_init = AbstractFunctionCode.__init__
11710 38c4d61db7ea rapid evolution towards producing real .pyc files (even though I don't Jeremy Hylton <jeremy@alum.mit.edu> parents: 11705 diff changeset	1359
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1360 def __init__(self, func, scopes, isLambda, class_name, mod):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1361 self.scopes = scopes
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1362 self.scope = scopes[func]
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1363 self.__super_init(func, scopes, isLambda, class_name, mod)
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1364 self.graph.setFreeVars(self.scope.get_free_vars())
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1365 self.graph.setCellVars(self.scope.get_cell_vars())
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1366 if self.scope.generator is not None:
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1367 self.graph.setFlag(CO_GENERATOR)
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1368
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1369 class GenExprCodeGenerator(NestedScopeMixin, AbstractFunctionCode,
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1370 CodeGenerator):
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1371 super_init = CodeGenerator.__init__ # call be other init
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1372 scopes = None
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1373
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1374 __super_init = AbstractFunctionCode.__init__
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1375
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1376 def __init__(self, gexp, scopes, class_name, mod):
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1377 self.scopes = scopes
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1378 self.scope = scopes[gexp]
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1379 self.__super_init(gexp, scopes, 1, class_name, mod)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1380 self.graph.setFreeVars(self.scope.get_free_vars())
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1381 self.graph.setCellVars(self.scope.get_cell_vars())
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1382 self.graph.setFlag(CO_GENERATOR)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 31729 diff changeset	1383
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1384 class AbstractClassCode:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1385
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1386 def __init__(self, klass, scopes, module):
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	1387 self.class_name = klass.name
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1388 self.module = module
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1389 self.graph = pyassem.PyFlowGraph(klass.name, klass.filename,
19561 81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	1390 optimized=0, klass=1)
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1391 self.super_init()
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1392 lnf = walk(klass.code, self.NameFinder(), verbose=0)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1393 self.locals.push(lnf.getLocals())
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1394 self.graph.setFlag(CO_NEWLOCALS)
17410 f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1395 if klass.doc:
f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1396 self.setDocstring(klass.doc)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1397
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1398 def get_module(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1399 return self.module
17437 02d69a887038 Inside a class scope always use LOAD_NAME, STORE_NAME, DEL_NAME Jeremy Hylton <jeremy@alum.mit.edu> parents: 17436 diff changeset	1400
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1401 def finish(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1402 self.graph.startExitBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1403 self.emit('LOAD_LOCALS')
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1404 self.emit('RETURN_VALUE')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1405
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1406 class ClassCodeGenerator(NestedScopeMixin, AbstractClassCode, CodeGenerator):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1407 super_init = CodeGenerator.__init__
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1408 scopes = None
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1409
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1410 __super_init = AbstractClassCode.__init__
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1411
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1412 def __init__(self, klass, scopes, module):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1413 self.scopes = scopes
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1414 self.scope = scopes[klass]
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1415 self.__super_init(klass, scopes, module)
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1416 self.graph.setFreeVars(self.scope.get_free_vars())
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1417 self.graph.setCellVars(self.scope.get_cell_vars())
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1418 self.set_lineno(klass)
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1419 self.emit("LOAD_GLOBAL", "__name__")
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1420 self.storeName("__module__")
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1421 if klass.doc:
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1422 self.emit("LOAD_CONST", klass.doc)
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 26670 diff changeset	1423 self.storeName('__doc__')
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1424
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1425 def generateArgList(arglist):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1426 """Generate an arg list marking TupleArgs"""
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1427 args = []
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1428 extra = []
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1429 count = 0
17449 51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1430 for i in range(len(arglist)):
51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1431 elt = arglist[i]
35946 b2eb1589c22b No need for types, use isinstance Neal Norwitz <nnorwitz@gmail.com> parents: 33204 diff changeset	1432 if isinstance(elt, str):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1433 args.append(elt)
35946 b2eb1589c22b No need for types, use isinstance Neal Norwitz <nnorwitz@gmail.com> parents: 33204 diff changeset	1434 elif isinstance(elt, tuple):
17449 51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1435 args.append(TupleArg(i * 2, elt))
51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1436 extra.extend(misc.flatten(elt))
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1437 count = count + 1
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1438 else:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1439 raise ValueError, "unexpect argument type:", elt
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1440 return args + extra, count
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1441
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1442 def findOp(node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1443 """Find the op (DELETE, LOAD, STORE) in an AssTuple tree"""
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1444 v = OpFinder()
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1445 walk(node, v, verbose=0)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1446 return v.op
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1447
11808 cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1448 class OpFinder:
cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1449 def __init__(self):
cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1450 self.op = None
cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1451 def visitAssName(self, node):
cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1452 if self.op is None:
cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1453 self.op = node.flags
cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1454 elif self.op != node.flags:
cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1455 raise ValueError, "mixed ops in stmt"
17454 d91577783335 Add support for visitAssAttr to findOp(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 17453 diff changeset	1456 visitAssAttr = visitAssName
20925 ee1437f5de03 Fix SF bug #479186: compiler generates bad code for "del" Jeremy Hylton <jeremy@alum.mit.edu> parents: 20547 diff changeset	1457 visitSubscript = visitAssName
11808 cf8fa92ebf3d the previous quick hack to fix def foo((x,y)) failed on some cases Jeremy Hylton <jeremy@alum.mit.edu> parents: 11806 diff changeset	1458
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1459 class Delegator:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1460 """Base class to support delegation for augmented assignment nodes
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1461
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1462 To generator code for augmented assignments, we use the following
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1463 wrapper classes. In visitAugAssign, the left-hand expression node
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1464 is visited twice. The first time the visit uses the normal method
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1465 for that node . The second time the visit uses a different method
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1466 that generates the appropriate code to perform the assignment.
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1467 These delegator classes wrap the original AST nodes in order to
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1468 support the variant visit methods.
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1469 """
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1470 def __init__(self, obj):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1471 self.obj = obj
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1472
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1473 def __getattr__(self, attr):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1474 return getattr(self.obj, attr)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1475
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1476 class AugGetattr(Delegator):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1477 pass
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1478
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1479 class AugName(Delegator):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1480 pass
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1481
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1482 class AugSlice(Delegator):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1483 pass
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1484
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1485 class AugSubscript(Delegator):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1486 pass
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1487
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1488 wrapper = {
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1489 ast.Getattr: AugGetattr,
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1490 ast.Name: AugName,
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1491 ast.Slice: AugSlice,
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1492 ast.Subscript: AugSubscript,
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1493 }
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1494
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1495 def wrap_aug(node):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1496 return wrapper[node.__class__](node)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1497
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1498 if __name__ == "__main__":
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1499 for file in sys.argv[1:]:
21059 e76306eea370 Fix [ #484645 ] little bug in pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 20925 diff changeset	1500 compileFile(file)

Mercurial > cpython-lru_cache-weakref

annotate Lib/compiler/pycodegen.py @ 57303:4aa4c19dfaed legacy-trunk