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

annotate Lib/compiler/pycodegen.py @ 25838:8540887bcec6 2.2

Backport of 2.183: Fix memory leak in add_subclass() found by NealN with valgrind.

author	Guido van Rossum <guido@python.org>
date	Fri, 18 Oct 2002 13:42:21 +0000
parents	42139abfdbe5
children

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 stat
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	5 import string
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	6 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	7 import sys
11793 d2ab9553f871 support for arglists with implicit tuple unpacks Jeremy Hylton <jeremy@alum.mit.edu> parents: 11789 diff changeset	8 import types
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	9 from cStringIO import StringIO
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	10
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	11 from compiler import ast, parse, walk, syntax
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	12 from compiler import pyassem, misc, future, symbols
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	13 from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL
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	14 from compiler.consts import CO_VARARGS, CO_VARKEYWORDS, CO_NEWLOCALS,\
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	15 CO_NESTED, CO_GENERATOR, CO_GENERATOR_ALLOWED, CO_FUTURE_DIVISION
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	16 from compiler.pyassem import TupleArg
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	17
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
21563 fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	37 # XXX this doesn't seem to be used
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	38 class BlockStack(misc.Stack):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	39 __super_init = misc.Stack.__init__
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	40
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	41 def __init__(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	42 self.__super_init(self)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	43 self.loop = None
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	44
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	45 def compileFile(filename, display=0):
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	46 f = open(filename)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	47 buf = f.read()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	48 f.close()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	49 mod = Module(buf, filename)
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	50 try:
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	51 mod.compile(display)
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	52 except SyntaxError, err:
19943 6773dcfe34a3 Last set of change to get regression tests to pass Jeremy Hylton <jeremy@alum.mit.edu> parents: 19939 diff changeset	53 raise
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	54 else:
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	55 f = open(filename + "c", "wb")
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	56 mod.dump(f)
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	57 f.close()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	58
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	59 def compile(source, filename, mode, flags=None, dont_inherit=None):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	60 """Replacement for builtin compile() function"""
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	61 if flags is not None or dont_inherit is not None:
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	62 raise RuntimeError, "not implemented yet"
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	63
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	64 if mode == "single":
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	65 gen = Interactive(source, filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	66 elif mode == "exec":
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	67 gen = Module(source, filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	68 elif mode == "eval":
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	69 gen = Expression(source, filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	70 else:
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	71 raise ValueError("compile() 3rd arg must be 'exec' or "
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	72 "'eval' or 'single'")
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	73 gen.compile()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	74 return gen.code
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	75
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	76 class AbstractCompileMode:
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	77
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	78 mode = None # defined by subclass
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	79
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	80 def __init__(self, source, filename):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	81 self.source = source
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	82 self.filename = filename
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	83 self.code = None
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	84
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	85 def _get_tree(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	86 tree = parse(self.source, self.mode)
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	87 misc.set_filename(self.filename, tree)
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	88 syntax.check(tree)
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	89 return tree
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 def compile(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	92 pass # implemented by subclass
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	93
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	94 def getCode(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	95 return self.code
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	96
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	97 class Expression(AbstractCompileMode):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	98
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	99 mode = "eval"
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	100
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	101 def compile(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	102 tree = self._get_tree()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	103 gen = ExpressionCodeGenerator(tree)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	104 self.code = gen.getCode()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	105
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	106 class Interactive(AbstractCompileMode):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	107
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	108 mode = "single"
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	109
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	110 def compile(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	111 tree = self._get_tree()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	112 gen = InteractiveCodeGenerator(tree)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	113 self.code = gen.getCode()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	114
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	115 class Module(AbstractCompileMode):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	116
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	117 mode = "exec"
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	118
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	119 def compile(self, display=0):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	120 tree = self._get_tree()
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	121 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	122 if display:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	123 import pprint
17346 f8fdbeb73667 Add support for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 15379 diff changeset	124 print pprint.pprint(tree)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	125 self.code = gen.getCode()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	126
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	127 def dump(self, f):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	128 f.write(self.getPycHeader())
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	129 marshal.dump(self.code, f)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	130
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	131 MAGIC = imp.get_magic()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	132
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	133 def getPycHeader(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	134 # 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	135 # 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	136 # 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	137 # same effect is to call marshal and then skip the code.
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	138 mtime = os.stat(self.filename)[stat.ST_MTIME]
25637 42139abfdbe5 A couple of fixes for the compiler package: Michael W. Hudson <mwh@python.net> parents: 21563 diff changeset	139 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	140 return self.MAGIC + mtime
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	141
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	142 class LocalNameFinder:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	143 """Find local names in scope"""
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	144 def __init__(self, names=()):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	145 self.names = misc.Set()
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	146 self.globals = misc.Set()
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	147 for name in names:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	148 self.names.add(name)
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 # XXX list comprehensions and for loops
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	151
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	152 def getLocals(self):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	153 for elt in self.globals.elements():
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	154 if self.names.has_elt(elt):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	155 self.names.remove(elt)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	156 return self.names
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	157
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	158 def visitDict(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	159 pass
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	160
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	161 def visitGlobal(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	162 for name in node.names:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	163 self.globals.add(name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	164
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	165 def visitFunction(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	166 self.names.add(node.name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	167
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	168 def visitLambda(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	169 pass
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 visitImport(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	172 for name, alias in node.names:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	173 self.names.add(alias or name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	174
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	175 def visitFrom(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	176 for name, alias in node.names:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	177 self.names.add(alias or name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	178
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	179 def visitClass(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	180 self.names.add(node.name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	181
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	182 def visitAssName(self, node):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	183 self.names.add(node.name)
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	184
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	185 def is_constant_false(node):
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	186 if isinstance(node, ast.Const):
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	187 if not node.value:
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	188 return 1
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	189 return 0
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	190
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	191 class CodeGenerator:
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	192 """Defines basic code generator for Python bytecode
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	193
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	194 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	195 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	196 __init__() defined in this class.
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	197
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	198 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	199 NameFinder, FunctionGen, and ClassGen. These attributes can be
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	200 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	201 initializing these methods after all the classes have been
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	202 defined.
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	203 """
11743 c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	204
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	205 optimized = 0 # is namespace access optimized?
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	206 __initialized = None
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	207 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	208
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	209 def __init__(self):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	210 if self.__initialized is None:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	211 self.initClass()
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	212 self.__class__.__initialized = 1
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	213 self.checkClass()
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	214 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	215 self.setups = misc.Stack()
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	216 self.curStack = 0
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	217 self.maxStack = 0
14362 a665bdc4922f patch by Neil Schemenauer to improve (fix?) line number generation Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	218 self.last_lineno = None
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	219 self._setupGraphDelegation()
19936 6944f5b9de03 support true division Jeremy Hylton <jeremy@alum.mit.edu> parents: 19923 diff changeset	220 self._div_op = "BINARY_DIVIDE"
11793 d2ab9553f871 support for arglists with implicit tuple unpacks Jeremy Hylton <jeremy@alum.mit.edu> parents: 11789 diff changeset	221
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	222 # 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	223 futures = self.get_module().futures
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	224 for feature in futures:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	225 if feature == "division":
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	226 self.graph.setFlag(CO_FUTURE_DIVISION)
19936 6944f5b9de03 support true division Jeremy Hylton <jeremy@alum.mit.edu> parents: 19923 diff changeset	227 self._div_op = "BINARY_TRUE_DIVIDE"
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	228 elif feature == "generators":
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	229 self.graph.setFlag(CO_GENERATOR_ALLOWED)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	230
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	231 def initClass(self):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	232 """This method is called once for each class"""
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	233
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	234 def checkClass(self):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	235 """Verify that class is constructed correctly"""
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	236 try:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	237 assert hasattr(self, 'graph')
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	238 assert getattr(self, 'NameFinder')
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	239 assert getattr(self, 'FunctionGen')
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	240 assert getattr(self, 'ClassGen')
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	241 except AssertionError, msg:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	242 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	243 raise AssertionError, intro
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	244
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	245 def _setupGraphDelegation(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	246 self.emit = self.graph.emit
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	247 self.newBlock = self.graph.newBlock
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	248 self.startBlock = self.graph.startBlock
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	249 self.nextBlock = self.graph.nextBlock
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	250 self.setDocstring = self.graph.setDocstring
11793 d2ab9553f871 support for arglists with implicit tuple unpacks Jeremy Hylton <jeremy@alum.mit.edu> parents: 11789 diff changeset	251
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	252 def getCode(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	253 """Return a code object"""
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	254 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	255
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	256 def mangle(self, name):
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	257 if self.class_name is not None:
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	258 return misc.mangle(name, self.class_name)
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	259 else:
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	260 return name
a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	261
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	262 def parseSymbols(self, tree):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	263 s = symbols.SymbolVisitor()
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	264 walk(tree, s)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	265 return s.scopes
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	266
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	267 def get_module(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	268 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	269
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	270 # 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	271
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	272 def isLocalName(self, name):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	273 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	274
11743 c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	275 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	276 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	277
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	278 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	279 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	280
c978a23a4dab add namespace attr to CodeGenerator, can be either MODULE_NAMESPACE or Jeremy Hylton <jeremy@alum.mit.edu> parents: 11734 diff changeset	281 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	282 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	283
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	284 def _nameOp(self, prefix, name):
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	285 name = self.mangle(name)
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	286 scope = self.scope.check_name(name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	287 if scope == SC_LOCAL:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	288 if not self.optimized:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	289 self.emit(prefix + '_NAME', name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	290 else:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	291 self.emit(prefix + '_FAST', name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	292 elif scope == SC_GLOBAL:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	293 if not self.optimized:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	294 self.emit(prefix + '_NAME', name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	295 else:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	296 self.emit(prefix + '_GLOBAL', name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	297 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	298 self.emit(prefix + '_DEREF', name)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	299 else:
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	300 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	301 (name, scope)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	302
17459 e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	303 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	304 """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	305
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	306 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	307 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	308 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	309 """
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	310 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	311 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	312 else:
e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	313 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	314
17453 f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	315 def set_lineno(self, node, force=0):
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	316 """Emit SET_LINENO if node has lineno attribute and it is
14362 a665bdc4922f patch by Neil Schemenauer to improve (fix?) line number generation Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	317 different than the last lineno 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	318
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	319 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	320
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	321 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	322 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	323 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	324 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	325 """
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 lineno = getattr(node, 'lineno', None)
17453 f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	327 if lineno is not None and (lineno != self.last_lineno
f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	328 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	329 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	330 self.last_lineno = 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	331 return 1
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	332 return 0
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
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	334 # 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	335 # 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	336 # specialized code generators to use.
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	337
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	338 NameFinder = LocalNameFinder
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	339 FunctionGen = None
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	340 ClassGen = None
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	341
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	342 def visitModule(self, node):
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	343 self.scopes = self.parseSymbols(node)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	344 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	345 self.emit('SET_LINENO', 0)
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	346 if node.doc:
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	347 self.emit('LOAD_CONST', node.doc)
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	348 self.storeName('__doc__')
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	349 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	350 self.locals.push(lnf.getLocals())
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	351 self.visit(node.node)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	352 self.emit('LOAD_CONST', None)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	353 self.emit('RETURN_VALUE')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	354
21563 fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	355 def visitExpression(self, node):
fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	356 self.set_lineno(node)
fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	357 self.scopes = self.parseSymbols(node)
fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	358 self.scope = self.scopes[node]
fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	359 self.visit(node.node)
fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	360 self.emit('RETURN_VALUE')
fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	361
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	362 def visitFunction(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	363 self._visitFuncOrLambda(node, isLambda=0)
17410 f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	364 if node.doc:
f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	365 self.setDocstring(node.doc)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	366 self.storeName(node.name)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	367
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	368 def visitLambda(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	369 self._visitFuncOrLambda(node, isLambda=1)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	370
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	371 def _visitFuncOrLambda(self, node, isLambda=0):
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	372 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	373 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	374 walk(node.code, gen)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	375 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	376 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	377 for default in node.defaults:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	378 self.visit(default)
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	379 frees = gen.scope.get_free_vars()
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	380 if frees:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	381 for name in frees:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	382 self.emit('LOAD_CLOSURE', name)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	383 self.emit('LOAD_CONST', gen)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	384 self.emit('MAKE_CLOSURE', len(node.defaults))
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	385 else:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	386 self.emit('LOAD_CONST', gen)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	387 self.emit('MAKE_FUNCTION', len(node.defaults))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	388
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	389 def visitClass(self, node):
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	390 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	391 self.get_module())
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	392 walk(node.code, gen)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	393 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	394 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	395 self.emit('LOAD_CONST', node.name)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	396 for base in node.bases:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	397 self.visit(base)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	398 self.emit('BUILD_TUPLE', len(node.bases))
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	399 frees = gen.scope.get_free_vars()
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	400 for name in frees:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	401 self.emit('LOAD_CLOSURE', name)
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	402 self.emit('LOAD_CONST', gen)
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	403 if frees:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	404 self.emit('MAKE_CLOSURE', 0)
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	405 else:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	406 self.emit('MAKE_FUNCTION', 0)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	407 self.emit('CALL_FUNCTION', 0)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	408 self.emit('BUILD_CLASS')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	409 self.storeName(node.name)
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 rest are standard visitor methods
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 # The next few implement control-flow statements
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	414
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	415 def visitIf(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	416 end = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	417 numtests = len(node.tests)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	418 for i in range(numtests):
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	419 test, suite = node.tests[i]
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	420 if is_constant_false(test):
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	421 # 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	422 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	423 self.set_lineno(test)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	424 self.visit(test)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	425 nextTest = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	426 self.emit('JUMP_IF_FALSE', nextTest)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	427 self.nextBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	428 self.emit('POP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	429 self.visit(suite)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	430 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	431 self.startBlock(nextTest)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	432 self.emit('POP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	433 if node.else_:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	434 self.visit(node.else_)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	435 self.nextBlock(end)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	436
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	437 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	438 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	439
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	440 loop = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	441 else_ = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	442
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	443 after = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	444 self.emit('SETUP_LOOP', after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	445
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	446 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	447 self.setups.push((LOOP, loop))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	448
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	449 self.set_lineno(node, force=1)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	450 self.visit(node.test)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	451 self.emit('JUMP_IF_FALSE', else_ or after)
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.nextBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	454 self.emit('POP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	455 self.visit(node.body)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	456 self.emit('JUMP_ABSOLUTE', loop)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	457
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	458 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	459 self.emit('POP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	460 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	461 self.setups.pop()
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	462 if node.else_:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	463 self.visit(node.else_)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	464 self.nextBlock(after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	465
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	466 def visitFor(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	467 start = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	468 anchor = self.newBlock()
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	469 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	470 self.setups.push((LOOP, start))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	471
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	472 self.set_lineno(node)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	473 self.emit('SETUP_LOOP', after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	474 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	475 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	476
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	477 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	478 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	479 self.emit('FOR_ITER', anchor)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	480 self.visit(node.assign)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	481 self.visit(node.body)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	482 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	483 self.nextBlock(anchor)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	484 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	485 self.setups.pop()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	486 if node.else_:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	487 self.visit(node.else_)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	488 self.nextBlock(after)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	489
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	490 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	491 if not self.setups:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	492 raise SyntaxError, "'break' outside loop (%s, %d)" % \
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	493 (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	494 self.set_lineno(node)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	495 self.emit('BREAK_LOOP')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	496
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	497 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	498 if not self.setups:
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	499 raise SyntaxError, "'continue' outside loop (%s, %d)" % \
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	500 (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	501 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	502 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	503 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	504 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	505 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	506 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	507 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	508 # 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	509 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	510 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	511 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	512 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	513 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	514 break
725762ca2774 Track the block stack more reasonably in order to handle continue in Jeremy Hylton <jeremy@alum.mit.edu> parents: 19567 diff changeset	515 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	516 raise SyntaxError, "'continue' outside loop (%s, %d)" % \
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	517 (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	518 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	519 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	520 elif kind == END_FINALLY:
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	521 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	522 raise SyntaxError, msg % (node.filename, node.lineno)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	523
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	524 def visitTest(self, node, jump):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	525 end = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	526 for child in node.nodes[:-1]:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	527 self.visit(child)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	528 self.emit(jump, end)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	529 self.nextBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	530 self.emit('POP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	531 self.visit(node.nodes[-1])
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	532 self.nextBlock(end)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	533
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	534 def visitAnd(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	535 self.visitTest(node, 'JUMP_IF_FALSE')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	536
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	537 def visitOr(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	538 self.visitTest(node, 'JUMP_IF_TRUE')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	539
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	540 def visitCompare(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	541 self.visit(node.expr)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	542 cleanup = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	543 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	544 self.visit(code)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	545 self.emit('DUP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	546 self.emit('ROT_THREE')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	547 self.emit('COMPARE_OP', op)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	548 self.emit('JUMP_IF_FALSE', cleanup)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	549 self.nextBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	550 self.emit('POP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	551 # now do the last comparison
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	552 if node.ops:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	553 op, code = node.ops[-1]
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	554 self.visit(code)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	555 self.emit('COMPARE_OP', op)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	556 if len(node.ops) > 1:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	557 end = self.newBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	558 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	559 self.startBlock(cleanup)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	560 self.emit('ROT_TWO')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	561 self.emit('POP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	562 self.nextBlock(end)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	563
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	564 # list comprehensions
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	565 __list_count = 0
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 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 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	568 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	569 # setup list
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	570 append = "$append%d" % self.__list_count
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	571 self.__list_count = self.__list_count + 1
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	572 self.emit('BUILD_LIST', 0)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	573 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	574 self.emit('LOAD_ATTR', 'append')
17459 e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	575 self._implicitNameOp('STORE', append)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	576
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	577 stack = []
17453 f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	578 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	579 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	580 cont = None
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	581 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	582 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	583 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	584 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	585 stack.insert(0, (start, cont, anchor))
17453 f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	586
17459 e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	587 self._implicitNameOp('LOAD', append)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	588 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	589 self.emit('CALL_FUNCTION', 1)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	590 self.emit('POP_TOP')
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	591
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	592 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	593 if cont:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	594 skip_one = 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 self.emit('JUMP_FORWARD', skip_one)
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	596 self.startBlock(cont)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	597 self.emit('POP_TOP')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	598 self.nextBlock(skip_one)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	599 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	600 self.startBlock(anchor)
17459 e846e960e7f6 Use new _implicitNameOp() to generate name op code for list comprehensions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17454 diff changeset	601 self._implicitNameOp('DELETE', append)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	602
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	603 self.__list_count = self.__list_count - 1
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 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	606 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	607 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	608
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	609 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	610 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	611 self.nextBlock(start)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	612 self.emit('SET_LINENO', node.lineno)
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	613 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	614 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	615 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	616 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	617
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	618 def visitListCompIf(self, node, branch):
17453 f3b6ac128de9 pyassem.py: Jeremy Hylton <jeremy@alum.mit.edu> parents: 17449 diff changeset	619 self.set_lineno(node, force=1)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	620 self.visit(node.test)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	621 self.emit('JUMP_IF_FALSE', branch)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	622 self.newBlock()
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	623 self.emit('POP_TOP')
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	624
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	625 # exception related
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	626
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	627 def visitAssert(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	628 # 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	629 # transformation of the AST before this stage
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	630 end = 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	631 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	632 # XXX __debug__ and AssertionError appear to be special cases
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	633 # -- they are always loaded as globals even if there are local
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	634 # names. I guess this is a sort of renaming op.
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	635 self.emit('LOAD_GLOBAL', '__debug__')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	636 self.emit('JUMP_IF_FALSE', end)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	637 self.nextBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	638 self.emit('POP_TOP')
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	639 self.visit(node.test)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	640 self.emit('JUMP_IF_TRUE', end)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	641 self.nextBlock()
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	642 self.emit('POP_TOP')
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	643 self.emit('LOAD_GLOBAL', 'AssertionError')
15379 7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	644 if node.fail:
7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	645 self.visit(node.fail)
7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	646 self.emit('RAISE_VARARGS', 2)
7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	647 else:
7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	648 self.emit('RAISE_VARARGS', 1)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	649 self.nextBlock(end)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	650 self.emit('POP_TOP')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	651
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	652 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	653 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	654 n = 0
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	655 if node.expr1:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	656 self.visit(node.expr1)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	657 n = n + 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	658 if node.expr2:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	659 self.visit(node.expr2)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	660 n = n + 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	661 if node.expr3:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	662 self.visit(node.expr3)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	663 n = n + 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	664 self.emit('RAISE_VARARGS', n)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	665
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	666 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	667 body = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	668 handlers = self.newBlock()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	669 end = self.newBlock()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	670 if node.else_:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	671 lElse = self.newBlock()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	672 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	673 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	674 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	675 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	676 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	677 self.setups.push((EXCEPT, body))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	678 self.visit(node.body)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	679 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	680 self.setups.pop()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	681 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	682 self.startBlock(handlers)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	683
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	684 last = len(node.handlers) - 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	685 for i in range(len(node.handlers)):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	686 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	687 self.set_lineno(expr)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	688 if expr:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	689 self.emit('DUP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	690 self.visit(expr)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	691 self.emit('COMPARE_OP', 'exception match')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	692 next = self.newBlock()
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	693 self.emit('JUMP_IF_FALSE', next)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	694 self.nextBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	695 self.emit('POP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	696 self.emit('POP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	697 if target:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	698 self.visit(target)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	699 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	700 self.emit('POP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	701 self.emit('POP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	702 self.visit(body)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	703 self.emit('JUMP_FORWARD', end)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	704 if expr:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	705 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	706 else:
7a82f84290f7 Change the graph structure to contain the code generator object for Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	707 self.nextBlock()
19531 deacd60272be Generate FOR_ITER-based loops instead of old FOR_LOOP-based loops Jeremy Hylton <jeremy@alum.mit.edu> parents: 19522 diff changeset	708 if expr: # XXX
deacd60272be Generate FOR_ITER-based loops instead of old FOR_LOOP-based loops Jeremy Hylton <jeremy@alum.mit.edu> parents: 19522 diff changeset	709 self.emit('POP_TOP')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	710 self.emit('END_FINALLY')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	711 if node.else_:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	712 self.nextBlock(lElse)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	713 self.visit(node.else_)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	714 self.nextBlock(end)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	715
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	716 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	717 body = self.newBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	718 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	719 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	720 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	721 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	722 self.setups.push((TRY_FINALLY, body))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	723 self.visit(node.body)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	724 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	725 self.setups.pop()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	726 self.emit('LOAD_CONST', None)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	727 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	728 self.setups.push((END_FINALLY, final))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	729 self.visit(node.final)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	730 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	731 self.setups.pop()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	732
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	733 # misc
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	734
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	735 def visitDiscard(self, node):
17412 3704be3db302 [finishing fix from earlier checkins] Jeremy Hylton <jeremy@alum.mit.edu> parents: 17410 diff changeset	736 self.set_lineno(node)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	737 self.visit(node.expr)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	738 self.emit('POP_TOP')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	739
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	740 def visitConst(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	741 self.emit('LOAD_CONST', node.value)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	742
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	743 def visitKeyword(self, node):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	744 self.emit('LOAD_CONST', node.name)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	745 self.visit(node.expr)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	746
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	747 def visitGlobal(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	748 # no code to generate
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	749 pass
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	750
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	751 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	752 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	753 self.loadName(node.name)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	754
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	755 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	756 self.set_lineno(node)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	757
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	758 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	759 self.set_lineno(node)
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	760 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	761 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	762 self.emit('LOAD_CONST', None)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	763 self.emit('IMPORT_NAME', name)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	764 mod = string.split(name, ".")[0]
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	765 self.storeName(alias or mod)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	766
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	767 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	768 self.set_lineno(node)
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	769 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	770 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	771 self.emit('LOAD_CONST', tuple(fromlist))
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	772 self.emit('IMPORT_NAME', node.modname)
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	773 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	774 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	775 if name == '*':
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	776 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	777 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	778 # 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	779 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	780 return
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	781 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	782 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	783 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	784 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	785 else:
100beebde9df Fix SF bug #116263: support for from .. import * Jeremy Hylton <jeremy@alum.mit.edu> parents: 14362 diff changeset	786 self.emit('IMPORT_FROM', name)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	787 self.emit('POP_TOP')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	788
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	789 def _resolveDots(self, name):
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	790 elts = string.split(name, ".")
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	791 if len(elts) == 1:
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	792 return
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	793 for elt in elts[1:]:
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	794 self.emit('LOAD_ATTR', elt)
35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13941 diff changeset	795
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	796 def visitGetattr(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	797 self.visit(node.expr)
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	798 self.emit('LOAD_ATTR', self.mangle(node.attrname))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	799
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	800 # next five implement assignments
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	801
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	802 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	803 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	804 self.visit(node.expr)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	805 dups = len(node.nodes) - 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	806 for i in range(len(node.nodes)):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	807 elt = node.nodes[i]
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	808 if i < dups:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	809 self.emit('DUP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	810 if isinstance(elt, ast.Node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	811 self.visit(elt)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	812
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	813 def visitAssName(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	814 if node.flags == 'OP_ASSIGN':
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	815 self.storeName(node.name)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	816 elif node.flags == 'OP_DELETE':
19561 81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	817 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	818 self.delName(node.name)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	819 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	820 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	821
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	822 def visitAssAttr(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	823 self.visit(node.expr)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	824 if node.flags == 'OP_ASSIGN':
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	825 self.emit('STORE_ATTR', self.mangle(node.attrname))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	826 elif node.flags == 'OP_DELETE':
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	827 self.emit('DELETE_ATTR', self.mangle(node.attrname))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	828 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	829 print "warning: unexpected flags:", node.flags
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	830 print node
11751 3f1da05ced55 add support for Lambda nodes Jeremy Hylton <jeremy@alum.mit.edu> parents: 11748 diff changeset	831
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	832 def _visitAssSequence(self, node, op='UNPACK_SEQUENCE'):
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	833 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	834 self.emit(op, len(node.nodes))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	835 for child in node.nodes:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	836 self.visit(child)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	837
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	838 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	839 visitAssTuple = _visitAssSequence
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	840 visitAssList = _visitAssSequence
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	841 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	842 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	843 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	844
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	845 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	846 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	847
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	848 # augmented assignment
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	849
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	850 def visitAugAssign(self, node):
19519 99e953c6709c emit SET_LINENO for augmented assignments Jeremy Hylton <jeremy@alum.mit.edu> parents: 19518 diff changeset	851 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	852 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	853 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	854 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	855 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	856 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	857
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	858 _augmented_opcode = {
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	859 '+=' : 'INPLACE_ADD',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	860 '-=' : 'INPLACE_SUBTRACT',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	861 '*=' : 'INPLACE_MULTIPLY',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	862 '/=' : 'INPLACE_DIVIDE',
19561 81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	863 '//=': '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	864 '%=' : 'INPLACE_MODULO',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	865 '**=': 'INPLACE_POWER',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	866 '>>=': 'INPLACE_RSHIFT',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	867 '<<=': 'INPLACE_LSHIFT',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	868 '&=' : 'INPLACE_AND',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	869 '^=' : 'INPLACE_XOR',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	870 '\|=' : 'INPLACE_OR',
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	871 }
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	872
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	873 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	874 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	875 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	876 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	877 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	878
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	879 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	880 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	881 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	882 self.emit('DUP_TOP')
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	883 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	884 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	885 self.emit('ROT_TWO')
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	886 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	887
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	888 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	889 if mode == "load":
17413 bad2daeb7440 typo Jeremy Hylton <jeremy@alum.mit.edu> parents: 17412 diff changeset	890 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	891 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	892 slice = 0
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	893 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	894 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	895 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	896 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	897 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	898 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	899 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	900 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	901 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	902 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	903 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	904
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	905 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	906 if len(node.subs) > 1:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	907 raise SyntaxError, "augmented assignment to tuple is not possible"
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	908 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	909 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	910 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	911 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	912 self.emit('STORE_SUBSCR')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	913
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	914 def visitExec(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	915 self.visit(node.expr)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	916 if node.locals is None:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	917 self.emit('LOAD_CONST', None)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	918 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	919 self.visit(node.locals)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	920 if node.globals is None:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	921 self.emit('DUP_TOP')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	922 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	923 self.visit(node.globals)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	924 self.emit('EXEC_STMT')
11751 3f1da05ced55 add support for Lambda nodes Jeremy Hylton <jeremy@alum.mit.edu> parents: 11748 diff changeset	925
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	926 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	927 pos = 0
dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	928 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	929 self.set_lineno(node)
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	930 self.visit(node.node)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	931 for arg in node.args:
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	932 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	933 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	934 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	935 else:
dffbd921eeed change MODULE_NAMESPACE/FUNCTION_NAMESPACE stuff to have a single flag Jeremy Hylton <jeremy@alum.mit.edu> parents: 11751 diff changeset	936 pos = pos + 1
12563 b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	937 if node.star_args is not None:
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	938 self.visit(node.star_args)
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	939 if node.dstar_args is not None:
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	940 self.visit(node.dstar_args)
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	941 have_star = node.star_args is not None
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	942 have_dstar = node.dstar_args is not None
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	943 opcode = callfunc_opcode_info[have_star, have_dstar]
b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12009 diff changeset	944 self.emit(opcode, kw << 8 \| pos)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	945
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	946 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	947 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	948 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	949 self.visit(node.dest)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	950 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	951 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	952 self.emit('DUP_TOP')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	953 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	954 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	955 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	956 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	957 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	958 self.emit('PRINT_ITEM')
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	959 if node.dest and not newline:
fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	960 self.emit('POP_TOP')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	961
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	962 def visitPrintnl(self, node):
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	963 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	964 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	965 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	966 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	967 self.emit('PRINT_NEWLINE')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	968
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	969 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	970 self.set_lineno(node)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	971 self.visit(node.value)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	972 self.emit('RETURN_VALUE')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	973
19923 cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	974 def visitYield(self, node):
cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	975 self.set_lineno(node)
cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	976 self.visit(node.value)
cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	977 self.emit('YIELD_STMT')
cb35d0f704de Add code generator for yield stmt Jeremy Hylton <jeremy@alum.mit.edu> parents: 19920 diff changeset	978
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	979 # slice and subscript stuff
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	980
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	981 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	982 # aug_flag is used by visitAugSlice
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	983 self.visit(node.expr)
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	984 slice = 0
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	985 if node.lower:
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	986 self.visit(node.lower)
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	987 slice = slice \| 1
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	988 if node.upper:
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	989 self.visit(node.upper)
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	990 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	991 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	992 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	993 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	994 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	995 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	996 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	997 self.emit('DUP_TOPX', 2)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	998 if node.flags == 'OP_APPLY':
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	999 self.emit('SLICE+%d' % slice)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1000 elif node.flags == 'OP_ASSIGN':
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1001 self.emit('STORE_SLICE+%d' % slice)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1002 elif node.flags == 'OP_DELETE':
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1003 self.emit('DELETE_SLICE+%d' % slice)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1004 else:
11789 860524182b9c finish first impl of code generator Jeremy Hylton <jeremy@alum.mit.edu> parents: 11766 diff changeset	1005 print "weird slice", node.flags
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1006 raise
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1007
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1008 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	1009 self.visit(node.expr)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1010 for sub in node.subs:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1011 self.visit(sub)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1012 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	1013 self.emit('DUP_TOPX', 2)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1014 if len(node.subs) > 1:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1015 self.emit('BUILD_TUPLE', len(node.subs))
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1016 if node.flags == 'OP_APPLY':
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1017 self.emit('BINARY_SUBSCR')
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1018 elif node.flags == 'OP_ASSIGN':
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1019 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	1020 elif node.flags == 'OP_DELETE':
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1021 self.emit('DELETE_SUBSCR')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1022
11927 79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1023 # binary ops
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1024
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1025 def binaryOp(self, node, op):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1026 self.visit(node.left)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1027 self.visit(node.right)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1028 self.emit(op)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1029
d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1030 def visitAdd(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1031 return self.binaryOp(node, 'BINARY_ADD')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1032
d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1033 def visitSub(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1034 return self.binaryOp(node, 'BINARY_SUBTRACT')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1035
d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1036 def visitMul(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1037 return self.binaryOp(node, 'BINARY_MULTIPLY')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1038
d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1039 def visitDiv(self, node):
19936 6944f5b9de03 support true division Jeremy Hylton <jeremy@alum.mit.edu> parents: 19923 diff changeset	1040 return self.binaryOp(node, self._div_op)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1041
19561 81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	1042 def visitFloorDiv(self, node):
81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	1043 return self.binaryOp(node, 'BINARY_FLOOR_DIVIDE')
81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	1044
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1045 def visitMod(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1046 return self.binaryOp(node, 'BINARY_MODULO')
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1047
11761 62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1048 def visitPower(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1049 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	1050
62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1051 def visitLeftShift(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1052 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	1053
62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1054 def visitRightShift(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1055 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	1056
11927 79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1057 # unary ops
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1058
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1059 def unaryOp(self, node, op):
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1060 self.visit(node.expr)
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1061 self.emit(op)
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1062
11761 62fa8ec8595f looks like everything is working except for try/except (pystone Jeremy Hylton <jeremy@alum.mit.edu> parents: 11755 diff changeset	1063 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	1064 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	1065
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1066 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	1067 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	1068
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1069 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	1070 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	1071
1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1072 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	1073 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	1074
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1075 def visitNot(self, node):
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1076 return self.unaryOp(node, 'UNARY_NOT')
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1077
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1078 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	1079 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	1080
11927 79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1081 # bit ops
79b6a6a882d9 rename compile.py to pycodegen.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 11808 diff changeset	1082
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1083 def bitOp(self, nodes, op):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1084 self.visit(nodes[0])
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1085 for node in nodes[1:]:
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1086 self.visit(node)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1087 self.emit(op)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1088
57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1089 def visitBitand(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1090 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	1091
57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1092 def visitBitor(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1093 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	1094
57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1095 def visitBitxor(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1096 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	1097
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1098 # 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	1099
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1100 def visitEllipsis(self, node):
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1101 self.emit('LOAD_CONST', Ellipsis)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1102
11727 1e952d933abb add optional verbose arg to walk function. it overrides the global Jeremy Hylton <jeremy@alum.mit.edu> parents: 11724 diff changeset	1103 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	1104 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	1105 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	1106 self.visit(elt)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1107 self.emit('BUILD_TUPLE', len(node.nodes))
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1108
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1109 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	1110 self.set_lineno(node)
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1111 for elt in node.nodes:
6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1112 self.visit(elt)
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1113 self.emit('BUILD_LIST', len(node.nodes))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1114
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1115 def visitSliceobj(self, node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1116 for child in node.nodes:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1117 self.visit(child)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1118 self.emit('BUILD_SLICE', len(node.nodes))
11734 6a99ff069457 add ExampleASTVisitor: Jeremy Hylton <jeremy@alum.mit.edu> parents: 11727 diff changeset	1119
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1120 def visitDict(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	1121 lineno = getattr(node, 'lineno', None)
c58149c0670a replace most calls to emit 'SET_LINENO' will call to method set_lineno Jeremy Hylton <jeremy@alum.mit.edu> parents: 12563 diff changeset	1122 if lineno:
19567 b98e4346257b Generate SET_LINENO for list and tuple literals when the open paren Jeremy Hylton <jeremy@alum.mit.edu> parents: 19561 diff changeset	1123 self.emit('SET_LINENO', lineno)
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1124 self.emit('BUILD_MAP', 0)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1125 for k, v in node.items:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1126 lineno2 = getattr(node, 'lineno', None)
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	1127 if lineno2 is not None and lineno != lineno2:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1128 self.emit('SET_LINENO', lineno2)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1129 lineno = lineno2
11806 57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1130 self.emit('DUP_TOP')
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1131 self.visit(v)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1132 self.emit('ROT_TWO')
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1133 self.visit(k)
57167731d124 satisfy the tabnanny Jeremy Hylton <jeremy@alum.mit.edu> parents: 11793 diff changeset	1134 self.emit('STORE_SUBSCR')
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1135
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1136 class NestedScopeMixin:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1137 """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	1138 def initClass(self):
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1139 self.__class__.NameFinder = LocalNameFinder
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1140 self.__class__.FunctionGen = FunctionCodeGenerator
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1141 self.__class__.ClassGen = ClassCodeGenerator
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1142
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1143 class ModuleCodeGenerator(NestedScopeMixin, CodeGenerator):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1144 __super_init = CodeGenerator.__init__
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1145
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1146 scopes = None
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1147
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1148 def __init__(self, tree):
aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1149 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	1150 self.futures = future.find_futures(tree)
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1151 self.__super_init()
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1152 walk(tree, self)
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1153
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1154 def get_module(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1155 return self
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1156
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1157 class ExpressionCodeGenerator(NestedScopeMixin, CodeGenerator):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1158 __super_init = CodeGenerator.__init__
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1159
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1160 scopes = None
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1161 futures = ()
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1162
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1163 def __init__(self, tree):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1164 self.graph = pyassem.PyFlowGraph("<expression>", tree.filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1165 self.__super_init()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1166 walk(tree, self)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1167
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1168 def get_module(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1169 return self
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1170
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1171 class InteractiveCodeGenerator(NestedScopeMixin, CodeGenerator):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1172
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1173 __super_init = CodeGenerator.__init__
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1174
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1175 scopes = None
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1176 futures = ()
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1177
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1178 def __init__(self, tree):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1179 self.graph = pyassem.PyFlowGraph("<interactive>", tree.filename)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1180 self.__super_init()
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1181 self.set_lineno(tree)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1182 walk(tree, self)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1183 self.emit('RETURN_VALUE')
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1184
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1185 def get_module(self):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1186 return self
21563 fcb649b1004d This commit was manufactured by cvs2svn to create branch cvs2svn <tools@python.org> parents: 21059 diff changeset	1187
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1188 def visitDiscard(self, node):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1189 # 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	1190 # name.
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1191 self.visit(node.expr)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1192 self.emit('PRINT_EXPR')
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	1193
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1194 class AbstractFunctionCode:
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1195 optimized = 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1196 lambdaCount = 0
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1197
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1198 def __init__(self, func, scopes, isLambda, class_name, mod):
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	1199 self.class_name = class_name
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1200 self.module = mod
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1201 if isLambda:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1202 klass = FunctionCodeGenerator
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1203 name = "<lambda.%d>" % klass.lambdaCount
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1204 klass.lambdaCount = klass.lambdaCount + 1
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1205 else:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1206 name = func.name
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1207 args, hasTupleArg = generateArgList(func.argnames)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1208 self.graph = pyassem.PyFlowGraph(name, func.filename, args,
a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1209 optimized=1)
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1210 self.isLambda = isLambda
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1211 self.super_init()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1212
17410 f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1213 if not isLambda and func.doc:
f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1214 self.setDocstring(func.doc)
f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1215
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1216 lnf = walk(func.code, self.NameFinder(args), verbose=0)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1217 self.locals.push(lnf.getLocals())
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1218 if func.varargs:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1219 self.graph.setFlag(CO_VARARGS)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1220 if func.kwargs:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1221 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	1222 self.set_lineno(func)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1223 if hasTupleArg:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1224 self.generateArgUnpack(func.argnames)
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1225
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1226 def get_module(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1227 return self.module
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1228
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1229 def finish(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1230 self.graph.startExitBlock()
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1231 if not self.isLambda:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1232 self.emit('LOAD_CONST', None)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1233 self.emit('RETURN_VALUE')
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1234
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1235 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	1236 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	1237 arg = args[i]
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1238 if type(arg) == types.TupleType:
17449 51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1239 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	1240 self.unpackSequence(arg)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1241
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1242 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	1243 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	1244 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	1245 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1246 self.emit('UNPACK_TUPLE', len(tup))
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1247 for elt in tup:
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1248 if type(elt) == types.TupleType:
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1249 self.unpackSequence(elt)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1250 else:
17438 41a423294cb5 Fix unpackSequence() to use _nameOp() rather than LOAD_FAST Jeremy Hylton <jeremy@alum.mit.edu> parents: 17437 diff changeset	1251 self._nameOp('STORE', elt)
11705 d10c108d3fd7 checking in initial weekend's work Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1252
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1253 unpackTuple = unpackSequence
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1254
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1255 class FunctionCodeGenerator(NestedScopeMixin, AbstractFunctionCode,
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19946 diff changeset	1256 CodeGenerator):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1257 super_init = CodeGenerator.__init__ # call be other init
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1258 scopes = None
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1259
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1260 __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	1261
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1262 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	1263 self.scopes = scopes
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1264 self.scope = scopes[func]
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1265 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	1266 self.graph.setFreeVars(self.scope.get_free_vars())
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1267 self.graph.setCellVars(self.scope.get_cell_vars())
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1268 if self.graph.checkFlag(CO_GENERATOR_ALLOWED):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1269 if self.scope.generator is not None:
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1270 self.graph.setFlag(CO_GENERATOR)
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1271
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1272 class AbstractClassCode:
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1273
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1274 def __init__(self, klass, scopes, module):
19522 a0847b7a8902 Handle private names Jeremy Hylton <jeremy@alum.mit.edu> parents: 19519 diff changeset	1275 self.class_name = klass.name
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1276 self.module = module
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1277 self.graph = pyassem.PyFlowGraph(klass.name, klass.filename,
19561 81168ef4cb65 Support // and //= Jeremy Hylton <jeremy@alum.mit.edu> parents: 19534 diff changeset	1278 optimized=0, klass=1)
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1279 self.super_init()
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1280 lnf = walk(klass.code, self.NameFinder(), verbose=0)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1281 self.locals.push(lnf.getLocals())
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1282 self.graph.setFlag(CO_NEWLOCALS)
17410 f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1283 if klass.doc:
f967489ee3b6 Generate docstrings. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17346 diff changeset	1284 self.setDocstring(klass.doc)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1285
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1286 def get_module(self):
63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1287 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	1288
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1289 def finish(self):
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1290 self.graph.startExitBlock()
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1291 self.emit('LOAD_LOCALS')
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1292 self.emit('RETURN_VALUE')
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1293
19920 63930159ca3c Various sundry changes for 2.2 compatibility Jeremy Hylton <jeremy@alum.mit.edu> parents: 19619 diff changeset	1294 class ClassCodeGenerator(NestedScopeMixin, AbstractClassCode, CodeGenerator):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1295 super_init = CodeGenerator.__init__
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1296 scopes = None
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1297
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1298 __super_init = AbstractClassCode.__init__
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1299
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1300 def __init__(self, klass, scopes, module):
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1301 self.scopes = scopes
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1302 self.scope = scopes[klass]
19939 aaca4d3cf62b Handle more syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19936 diff changeset	1303 self.__super_init(klass, scopes, module)
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1304 self.graph.setFreeVars(self.scope.get_free_vars())
98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1305 self.graph.setCellVars(self.scope.get_cell_vars())
25637 42139abfdbe5 A couple of fixes for the compiler package: Michael W. Hudson <mwh@python.net> parents: 21563 diff changeset	1306 self.set_lineno(klass)
42139abfdbe5 A couple of fixes for the compiler package: Michael W. Hudson <mwh@python.net> parents: 21563 diff changeset	1307 if klass.doc:
42139abfdbe5 A couple of fixes for the compiler package: Michael W. Hudson <mwh@python.net> parents: 21563 diff changeset	1308 self.emit("LOAD_CONST", klass.doc)
42139abfdbe5 A couple of fixes for the compiler package: Michael W. Hudson <mwh@python.net> parents: 21563 diff changeset	1309 self.storeName("__doc__")
17436 98f69245bb69 Preliminary support for nested scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17413 diff changeset	1310
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1311 def generateArgList(arglist):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1312 """Generate an arg list marking TupleArgs"""
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1313 args = []
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1314 extra = []
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1315 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	1316 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	1317 elt = arglist[i]
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1318 if type(elt) == types.StringType:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1319 args.append(elt)
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1320 elif type(elt) == types.TupleType:
17449 51c8ce1a2e25 Revise handling of tuple arguments so that the variables names match Jeremy Hylton <jeremy@alum.mit.edu> parents: 17438 diff changeset	1321 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	1322 extra.extend(misc.flatten(elt))
13941 d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1323 count = count + 1
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1324 else:
d56dd1530ce1 Bring Tools/compiler almost up to date. Specifically: Thomas Wouters <thomas@python.org> parents: 13864 diff changeset	1325 raise ValueError, "unexpect argument type:", elt
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1326 return args + extra, count
11755 57fb3501ab22 split compile.py into two files Jeremy Hylton <jeremy@alum.mit.edu> parents: 11754 diff changeset	1327
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1328 def findOp(node):
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1329 """Find the op (DELETE, LOAD, STORE) in an AssTuple tree"""
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1330 v = OpFinder()
19518 fbb35268fed4 Many changes -- bug fixes and sundry improvements Jeremy Hylton <jeremy@alum.mit.edu> parents: 17460 diff changeset	1331 walk(node, v, verbose=0)
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1332 return v.op
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1333
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	1334 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	1335 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	1336 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	1337 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	1338 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	1339 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	1340 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	1341 raise ValueError, "mixed ops in stmt"
17454 d91577783335 Add support for visitAssAttr to findOp(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 17453 diff changeset	1342 visitAssAttr = visitAssName
20925 ee1437f5de03 Fix SF bug #479186: compiler generates bad code for "del" Jeremy Hylton <jeremy@alum.mit.edu> parents: 20547 diff changeset	1343 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	1344
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1345 class Delegator:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1346 """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	1347
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1348 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	1349 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	1350 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	1351 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	1352 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	1353 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	1354 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	1355 """
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1356 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	1357 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	1358
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1359 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	1360 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	1361
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1362 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	1363 pass
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1364
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1365 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	1366 pass
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1367
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1368 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	1369 pass
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1370
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1371 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	1372 pass
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1373
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1374 wrapper = {
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1375 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	1376 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	1377 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	1378 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	1379 }
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1380
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1381 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	1382 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	1383
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1384 if __name__ == "__main__":
127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1385 import sys
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	1386
12009 127f70f59b02 complete rewrite Jeremy Hylton <jeremy@alum.mit.edu> parents: 11927 diff changeset	1387 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	1388 compileFile(file)

Mercurial > cpython-lru_cache-weakref

annotate Lib/compiler/pycodegen.py @ 25838:8540887bcec6 2.2