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

annotate Lib/compiler/transformer.py @ 79675:c0a2294de787 2.7

Issue #16199: Backport 2to3 typo fix from 3.2.

author	Chris Jerdonek <chris.jerdonek@gmail.com>
date	Thu, 11 Oct 2012 16:15:46 -0700
parents	edfed0e32ced
children

rev	line source
11923 d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	1 """Parse tree transformation module.
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	2
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	3 Transforms Python source code into an abstract syntax tree (AST)
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	4 defined in the ast module.
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	5
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	6 The simplest ways to invoke this module are via parse and parseFile.
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	7 parse(buf) -> AST
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	8 parseFile(path) -> AST
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	9 """
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	10
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	11 # Original version written by Greg Stein (gstein@lyra.org)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	12 # and Bill Tutt (rassilon@lima.mudlib.org)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	13 # February 1997.
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	14 #
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	15 # Modifications and improvements for Python 2.0 by Jeremy Hylton and
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	16 # Mark Hammond
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	17 #
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	18 # Some fixes to try to have correct line number on almost all nodes
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	19 # (except Module, Discard and Stmt) added by Sylvain Thenault
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	20 #
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	21 # Portions of this file are:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	22 # Copyright (C) 1997-1998 Greg Stein. All Rights Reserved.
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	23 #
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	24 # This module is provided under a BSD-ish license. See
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	25 # http://www.opensource.org/licenses/bsd-license.html
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	26 # and replace OWNER, ORGANIZATION, and YEAR as appropriate.
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	27
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	28 from compiler.ast import *
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	29 import parser
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	30 import symbol
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	31 import token
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	32
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	33 class WalkerError(StandardError):
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	34 pass
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	35
37408 a60a9443e8da Use absolute imports Neal Norwitz <nnorwitz@gmail.com> parents: 36820 diff changeset	36 from compiler.consts import CO_VARARGS, CO_VARKEYWORDS
a60a9443e8da Use absolute imports Neal Norwitz <nnorwitz@gmail.com> parents: 36820 diff changeset	37 from compiler.consts import OP_ASSIGN, OP_DELETE, OP_APPLY
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	38
11923 d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	39 def parseFile(path):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	40 f = open(path, "U")
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	41 # XXX The parser API tolerates files without a trailing newline,
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	42 # but not strings without a trailing newline. Always add an extra
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	43 # newline to the file contents, since we're going through the string
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	44 # version of the API.
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	45 src = f.read() + "\n"
11923 d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	46 f.close()
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	47 return parse(src)
d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	48
19946 41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	49 def parse(buf, mode="exec"):
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	50 if mode == "exec" or mode == "single":
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	51 return Transformer().parsesuite(buf)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	52 elif mode == "eval":
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	53 return Transformer().parseexpr(buf)
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	54 else:
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	55 raise ValueError("compile() arg 3 must be"
41799b70a96c API change: Jeremy Hylton <jeremy@alum.mit.edu> parents: 19943 diff changeset	56 " 'exec' or 'eval' or 'single'")
11923 d097bc5aa7f3 change node Classdef to Class Jeremy Hylton <jeremy@alum.mit.edu> parents: 11792 diff changeset	57
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	58 def asList(nodes):
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	59 l = []
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	60 for item in nodes:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	61 if hasattr(item, "asList"):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	62 l.append(item.asList())
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	63 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	64 if type(item) is type( (None, None) ):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	65 l.append(tuple(asList(item)))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	66 elif type(item) is type( [] ):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	67 l.append(asList(item))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	68 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	69 l.append(item)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	70 return l
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	71
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	72 def extractLineNo(ast):
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	73 if not isinstance(ast[1], tuple):
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	74 # get a terminal node
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	75 return ast[2]
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	76 for child in ast[1:]:
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	77 if isinstance(child, tuple):
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	78 lineno = extractLineNo(child)
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	79 if lineno is not None:
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	80 return lineno
33463 28ef5fe0b8b5 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 33423 diff changeset	81
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	82 def Node(*args):
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	83 kind = args[0]
50257 e4675113d10e Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48313 diff changeset	84 if kind in nodes:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	85 try:
28513 90c77b8af1a4 SF patch #701494: more apply removals Raymond Hettinger <python@rcn.com> parents: 28231 diff changeset	86 return nodes[kind](*args[1:])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	87 except TypeError:
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	88 print nodes[kind], len(args), args
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	89 raise
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	90 else:
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	91 raise WalkerError, "Can't find appropriate Node type: %s" % str(args)
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	92 #return apply(ast.Node, args)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	93
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	94 class Transformer:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	95 """Utility object for transforming Python parse trees.
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	96
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	97 Exposes the following methods:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	98 tree = transform(ast_tree)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	99 tree = parsesuite(text)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	100 tree = parseexpr(text)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	101 tree = parsefile(fileob \| filename)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	102 """
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	103
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	104 def __init__(self):
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	105 self._dispatch = {}
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	106 for value, name in symbol.sym_name.items():
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	107 if hasattr(self, name):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	108 self._dispatch[value] = getattr(self, name)
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	109 self._dispatch[token.NEWLINE] = self.com_NEWLINE
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	110 self._atom_dispatch = {token.LPAR: self.atom_lpar,
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	111 token.LSQB: self.atom_lsqb,
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	112 token.LBRACE: self.atom_lbrace,
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	113 token.BACKQUOTE: self.atom_backquote,
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	114 token.NUMBER: self.atom_number,
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	115 token.STRING: self.atom_string,
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	116 token.NAME: self.atom_name,
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	117 }
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	118 self.encoding = None
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	119
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	120 def transform(self, tree):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	121 """Transform an AST into a modified parse tree."""
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	122 if not (isinstance(tree, tuple) or isinstance(tree, list)):
50257 e4675113d10e Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48313 diff changeset	123 tree = parser.st2tuple(tree, line_info=1)
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	124 return self.compile_node(tree)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	125
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	126 def parsesuite(self, text):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	127 """Return a modified parse tree for the given suite text."""
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	128 return self.transform(parser.suite(text))
33463 28ef5fe0b8b5 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 33423 diff changeset	129
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	130 def parseexpr(self, text):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	131 """Return a modified parse tree for the given expression text."""
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	132 return self.transform(parser.expr(text))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	133
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	134 def parsefile(self, file):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	135 """Return a modified parse tree for the contents of the given file."""
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	136 if type(file) == type(''):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	137 file = open(file)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	138 return self.parsesuite(file.read())
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	139
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	140 # --------------------------------------------------------------
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	141 #
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	142 # PRIVATE METHODS
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	143 #
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	144
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	145 def compile_node(self, node):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	146 ### emit a line-number node?
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	147 n = node[0]
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	148
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	149 if n == symbol.encoding_decl:
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	150 self.encoding = node[2]
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	151 node = node[1]
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	152 n = node[0]
28231 4cafa5141012 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 27045 diff changeset	153
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	154 if n == symbol.single_input:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	155 return self.single_input(node[1:])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	156 if n == symbol.file_input:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	157 return self.file_input(node[1:])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	158 if n == symbol.eval_input:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	159 return self.eval_input(node[1:])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	160 if n == symbol.lambdef:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	161 return self.lambdef(node[1:])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	162 if n == symbol.funcdef:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	163 return self.funcdef(node[1:])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	164 if n == symbol.classdef:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	165 return self.classdef(node[1:])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	166
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	167 raise WalkerError, ('unexpected node type', n)
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	168
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	169 def single_input(self, node):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	170 ### do we want to do anything about being "interactive" ?
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	171
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	172 # NEWLINE \| simple_stmt \| compound_stmt NEWLINE
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	173 n = node[0][0]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	174 if n != token.NEWLINE:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	175 return self.com_stmt(node[0])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	176
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	177 return Pass()
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	178
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	179 def file_input(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	180 doc = self.get_docstring(nodelist, symbol.file_input)
19358 0dad0dc7149b Add Yield() statement handler Jeremy Hylton <jeremy@alum.mit.edu> parents: 17409 diff changeset	181 if doc is not None:
0dad0dc7149b Add Yield() statement handler Jeremy Hylton <jeremy@alum.mit.edu> parents: 17409 diff changeset	182 i = 1
0dad0dc7149b Add Yield() statement handler Jeremy Hylton <jeremy@alum.mit.edu> parents: 17409 diff changeset	183 else:
0dad0dc7149b Add Yield() statement handler Jeremy Hylton <jeremy@alum.mit.edu> parents: 17409 diff changeset	184 i = 0
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	185 stmts = []
19358 0dad0dc7149b Add Yield() statement handler Jeremy Hylton <jeremy@alum.mit.edu> parents: 17409 diff changeset	186 for node in nodelist[i:]:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	187 if node[0] != token.ENDMARKER and node[0] != token.NEWLINE:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	188 self.com_append_stmt(stmts, node)
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	189 return Module(doc, Stmt(stmts))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	190
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	191 def eval_input(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	192 # from the built-in function input()
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	193 ### is this sufficient?
21522 cb55f15b2730 Merge of the release22 branch changes back into the trunk. Barry Warsaw <barry@python.org> parents: 20547 diff changeset	194 return Expression(self.com_node(nodelist[0]))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	195
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	196 def decorator_name(self, nodelist):
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	197 listlen = len(nodelist)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	198 assert listlen >= 1 and listlen % 2 == 1
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	199
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	200 item = self.atom_name(nodelist)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	201 i = 1
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	202 while i < listlen:
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	203 assert nodelist[i][0] == token.DOT
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	204 assert nodelist[i + 1][0] == token.NAME
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	205 item = Getattr(item, nodelist[i + 1][1])
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	206 i += 2
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	207
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	208 return item
32949 9ebd405683cd Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 32888 diff changeset	209
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	210 def decorator(self, nodelist):
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	211 # '@' dotted_name [ '(' [arglist] ')' ]
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32949 diff changeset	212 assert len(nodelist) in (3, 5, 6)
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	213 assert nodelist[0][0] == token.AT
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32949 diff changeset	214 assert nodelist[-1][0] == token.NEWLINE
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	215
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	216 assert nodelist[1][0] == symbol.dotted_name
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	217 funcname = self.decorator_name(nodelist[1][1:])
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	218
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32949 diff changeset	219 if len(nodelist) > 3:
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	220 assert nodelist[2][0] == token.LPAR
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	221 expr = self.com_call_function(funcname, nodelist[3])
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	222 else:
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	223 expr = funcname
32949 9ebd405683cd Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 32888 diff changeset	224
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	225 return expr
32949 9ebd405683cd Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 32888 diff changeset	226
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	227 def decorators(self, nodelist):
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	228 # decorators: decorator ([NEWLINE] decorator)* NEWLINE
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	229 items = []
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32949 diff changeset	230 for dec_nodelist in nodelist:
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32949 diff changeset	231 assert dec_nodelist[0] == symbol.decorator
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32949 diff changeset	232 items.append(self.decorator(dec_nodelist[1:]))
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	233 return Decorators(items)
32949 9ebd405683cd Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 32888 diff changeset	234
45520 144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	235 def decorated(self, nodelist):
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	236 assert nodelist[0][0] == symbol.decorators
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	237 if nodelist[1][0] == symbol.funcdef:
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	238 n = [nodelist[0]] + list(nodelist[1][1:])
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	239 return self.funcdef(n)
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	240 elif nodelist[1][0] == symbol.classdef:
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	241 decorators = self.decorators(nodelist[0][1:])
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	242 cls = self.classdef(nodelist[1][1:])
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	243 cls.decorators = decorators
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	244 return cls
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	245 raise WalkerError()
144e84672ef9 Issue 2117. Update compiler module to handle class decorators. Facundo Batista <facundobatista@gmail.com> parents: 45468 diff changeset	246
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	247 def funcdef(self, nodelist):
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	248 # -6 -5 -4 -3 -2 -1
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	249 # funcdef: [decorators] 'def' NAME parameters ':' suite
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	250 # parameters: '(' [varargslist] ')'
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	251
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	252 if len(nodelist) == 6:
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	253 assert nodelist[0][0] == symbol.decorators
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	254 decorators = self.decorators(nodelist[0][1:])
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	255 else:
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	256 assert len(nodelist) == 5
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	257 decorators = None
32949 9ebd405683cd Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 32888 diff changeset	258
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	259 lineno = nodelist[-4][2]
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	260 name = nodelist[-4][1]
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	261 args = nodelist[-3][2]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	262
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	263 if args[0] == symbol.varargslist:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	264 names, defaults, flags = self.com_arglist(args[1:])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	265 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	266 names = defaults = ()
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	267 flags = 0
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	268 doc = self.get_docstring(nodelist[-1])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	269
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	270 # code for function
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32633 diff changeset	271 code = self.com_node(nodelist[-1])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	272
15378 9b1be1d84810 If a function contains a doc string, remove the doc string node from Jeremy Hylton <jeremy@alum.mit.edu> parents: 15329 diff changeset	273 if doc is not None:
9b1be1d84810 If a function contains a doc string, remove the doc string node from Jeremy Hylton <jeremy@alum.mit.edu> parents: 15329 diff changeset	274 assert isinstance(code, Stmt)
9b1be1d84810 If a function contains a doc string, remove the doc string node from Jeremy Hylton <jeremy@alum.mit.edu> parents: 15329 diff changeset	275 assert isinstance(code.nodes[0], Discard)
9b1be1d84810 If a function contains a doc string, remove the doc string node from Jeremy Hylton <jeremy@alum.mit.edu> parents: 15329 diff changeset	276 del code.nodes[0]
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	277 return Function(decorators, name, names, defaults, flags, doc, code,
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	278 lineno=lineno)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	279
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	280 def lambdef(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	281 # lambdef: 'lambda' [varargslist] ':' test
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	282 if nodelist[2][0] == symbol.varargslist:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	283 names, defaults, flags = self.com_arglist(nodelist[2][1:])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	284 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	285 names = defaults = ()
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	286 flags = 0
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	287
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	288 # code for lambda
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	289 code = self.com_node(nodelist[-1])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	290
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	291 return Lambda(names, defaults, flags, code, lineno=nodelist[1][2])
36671 584637d831e3 Alias non-terminals introduced for backwards compatibility. Martin v. Löwis <martin@v.loewis.de> parents: 35948 diff changeset	292 old_lambdef = lambdef
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	293
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	294 def classdef(self, nodelist):
34887 7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33942 diff changeset	295 # classdef: 'class' NAME ['(' [testlist] ')'] ':' suite
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	296
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	297 name = nodelist[1][1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	298 doc = self.get_docstring(nodelist[-1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	299 if nodelist[2][0] == token.COLON:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	300 bases = []
34887 7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33942 diff changeset	301 elif nodelist[3][0] == token.RPAR:
7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33942 diff changeset	302 bases = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	303 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	304 bases = self.com_bases(nodelist[3])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	305
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	306 # code for class
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	307 code = self.com_node(nodelist[-1])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	308
19554 ddc4c2f5efbc Don't include doc string of class in its code child Jeremy Hylton <jeremy@alum.mit.edu> parents: 19510 diff changeset	309 if doc is not None:
ddc4c2f5efbc Don't include doc string of class in its code child Jeremy Hylton <jeremy@alum.mit.edu> parents: 19510 diff changeset	310 assert isinstance(code, Stmt)
ddc4c2f5efbc Don't include doc string of class in its code child Jeremy Hylton <jeremy@alum.mit.edu> parents: 19510 diff changeset	311 assert isinstance(code.nodes[0], Discard)
ddc4c2f5efbc Don't include doc string of class in its code child Jeremy Hylton <jeremy@alum.mit.edu> parents: 19510 diff changeset	312 del code.nodes[0]
ddc4c2f5efbc Don't include doc string of class in its code child Jeremy Hylton <jeremy@alum.mit.edu> parents: 19510 diff changeset	313
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	314 return Class(name, bases, doc, code, lineno=nodelist[1][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	315
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	316 def stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	317 return self.com_stmt(nodelist[0])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	318
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	319 small_stmt = stmt
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	320 flow_stmt = stmt
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	321 compound_stmt = stmt
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	322
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	323 def simple_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	324 # small_stmt (';' small_stmt)* [';'] NEWLINE
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	325 stmts = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	326 for i in range(0, len(nodelist), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	327 self.com_append_stmt(stmts, nodelist[i])
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	328 return Stmt(stmts)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	329
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	330 def parameters(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	331 raise WalkerError
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	332
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	333 def varargslist(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	334 raise WalkerError
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	335
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	336 def fpdef(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	337 raise WalkerError
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	338
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	339 def fplist(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	340 raise WalkerError
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	341
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	342 def dotted_name(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	343 raise WalkerError
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	344
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	345 def comp_op(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	346 raise WalkerError
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	347
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	348 def trailer(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	349 raise WalkerError
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	350
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	351 def sliceop(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	352 raise WalkerError
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	353
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	354 def argument(self, nodelist):
35192 68266803c013 patch [ 1231538 ] Typo fix in compiler/transformer.py (WalkerEror) Georg Brandl <georg@python.org> parents: 34887 diff changeset	355 raise WalkerError
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	356
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	357 # --------------------------------------------------------------
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	358 #
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	359 # STATEMENT NODES (invoked by com_node())
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	360 #
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	361
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	362 def expr_stmt(self, nodelist):
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	363 # augassign testlist \| testlist ('=' testlist)*
19510 ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	364 en = nodelist[-1]
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	365 exprNode = self.lookup_node(en)(en[1:])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	366 if len(nodelist) == 1:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	367 return Discard(exprNode, lineno=exprNode.lineno)
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	368 if nodelist[1][0] == token.EQUAL:
22089 4009c08402b1 Patch #522279: transformer.py nodes shadows global. Martin v. Löwis <martin@v.loewis.de> parents: 21522 diff changeset	369 nodesl = []
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	370 for i in range(0, len(nodelist) - 2, 2):
22089 4009c08402b1 Patch #522279: transformer.py nodes shadows global. Martin v. Löwis <martin@v.loewis.de> parents: 21522 diff changeset	371 nodesl.append(self.com_assign(nodelist[i], OP_ASSIGN))
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	372 return Assign(nodesl, exprNode, lineno=nodelist[1][2])
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	373 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	374 lval = self.com_augassign(nodelist[0])
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	375 op = self.com_augassign_op(nodelist[1])
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	376 return AugAssign(lval, op[1], exprNode, lineno=op[2])
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	377 raise WalkerError, "can't get here"
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	378
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	379 def print_stmt(self, nodelist):
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	380 # print ([ test (',' test)* [','] ] \| '>>' test [ (',' test)+ [','] ])
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	381 items = []
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	382 if len(nodelist) == 1:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	383 start = 1
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	384 dest = None
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	385 elif nodelist[1][0] == token.RIGHTSHIFT:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	386 assert len(nodelist) == 3 \
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	387 or nodelist[3][0] == token.COMMA
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	388 dest = self.com_node(nodelist[2])
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	389 start = 4
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	390 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	391 dest = None
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	392 start = 1
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	393 for i in range(start, len(nodelist), 2):
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	394 items.append(self.com_node(nodelist[i]))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	395 if nodelist[-1][0] == token.COMMA:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	396 return Print(items, dest, lineno=nodelist[0][2])
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	397 return Printnl(items, dest, lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	398
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	399 def del_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	400 return self.com_assign(nodelist[1], OP_DELETE)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	401
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	402 def pass_stmt(self, nodelist):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	403 return Pass(lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	404
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	405 def break_stmt(self, nodelist):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	406 return Break(lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	407
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	408 def continue_stmt(self, nodelist):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	409 return Continue(lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	410
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	411 def return_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	412 # return: [testlist]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	413 if len(nodelist) < 2:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	414 return Return(Const(None), lineno=nodelist[0][2])
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	415 return Return(self.com_node(nodelist[1]), lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	416
19358 0dad0dc7149b Add Yield() statement handler Jeremy Hylton <jeremy@alum.mit.edu> parents: 17409 diff changeset	417 def yield_stmt(self, nodelist):
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35192 diff changeset	418 expr = self.com_node(nodelist[0])
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35192 diff changeset	419 return Discard(expr, lineno=expr.lineno)
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35192 diff changeset	420
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35192 diff changeset	421 def yield_expr(self, nodelist):
36798 8ddcaaa08fdd Fix failure of test_compiler.py when compiling test_contextlib.py. Guido van Rossum <guido@python.org> parents: 36706 diff changeset	422 if len(nodelist) > 1:
8ddcaaa08fdd Fix failure of test_compiler.py when compiling test_contextlib.py. Guido van Rossum <guido@python.org> parents: 36706 diff changeset	423 value = self.com_node(nodelist[1])
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35192 diff changeset	424 else:
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35192 diff changeset	425 value = Const(None)
36798 8ddcaaa08fdd Fix failure of test_compiler.py when compiling test_contextlib.py. Guido van Rossum <guido@python.org> parents: 36706 diff changeset	426 return Yield(value, lineno=nodelist[0][2])
19358 0dad0dc7149b Add Yield() statement handler Jeremy Hylton <jeremy@alum.mit.edu> parents: 17409 diff changeset	427
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	428 def raise_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	429 # raise: [test [',' test [',' test]]]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	430 if len(nodelist) > 5:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	431 expr3 = self.com_node(nodelist[5])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	432 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	433 expr3 = None
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	434 if len(nodelist) > 3:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	435 expr2 = self.com_node(nodelist[3])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	436 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	437 expr2 = None
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	438 if len(nodelist) > 1:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	439 expr1 = self.com_node(nodelist[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	440 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	441 expr1 = None
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	442 return Raise(expr1, expr2, expr3, lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	443
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	444 def import_stmt(self, nodelist):
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	445 # import_stmt: import_name \| import_from
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	446 assert len(nodelist) == 1
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	447 return self.com_node(nodelist[0])
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	448
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	449 def import_name(self, nodelist):
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	450 # import_name: 'import' dotted_as_names
33463 28ef5fe0b8b5 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 33423 diff changeset	451 return Import(self.com_dotted_as_names(nodelist[1]),
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	452 lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	453
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	454 def import_from(self, nodelist):
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	455 # import_from: 'from' ('.'* dotted_name \| '.') 'import' ('*' \|
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	456 # '(' import_as_names ')' \| import_as_names)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	457 assert nodelist[0][1] == 'from'
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	458 idx = 1
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	459 while nodelist[idx][1] == '.':
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	460 idx += 1
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	461 level = idx - 1
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	462 if nodelist[idx][0] == symbol.dotted_name:
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	463 fromname = self.com_dotted_name(nodelist[idx])
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	464 idx += 1
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	465 else:
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	466 fromname = ""
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	467 assert nodelist[idx][1] == 'import'
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	468 if nodelist[idx + 1][0] == token.STAR:
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	469 return From(fromname, [('*', None)], level,
33942 82d02564123d Fix bug Michael W. Hudson <mwh@python.net> parents: 33719 diff changeset	470 lineno=nodelist[0][2])
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	471 else:
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	472 node = nodelist[idx + 1 + (nodelist[idx + 1][0] == token.LPAR)]
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	473 return From(fromname, self.com_import_as_names(node), level,
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	474 lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	475
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	476 def global_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	477 # global: NAME (',' NAME)*
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	478 names = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	479 for i in range(1, len(nodelist), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	480 names.append(nodelist[i][1])
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	481 return Global(names, lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	482
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	483 def exec_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	484 # exec_stmt: 'exec' expr ['in' expr [',' expr]]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	485 expr1 = self.com_node(nodelist[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	486 if len(nodelist) >= 4:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	487 expr2 = self.com_node(nodelist[3])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	488 if len(nodelist) >= 6:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	489 expr3 = self.com_node(nodelist[5])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	490 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	491 expr3 = None
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	492 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	493 expr2 = expr3 = None
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	494
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	495 return Exec(expr1, expr2, expr3, lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	496
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	497 def assert_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	498 # 'assert': test, [',' test]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	499 expr1 = self.com_node(nodelist[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	500 if (len(nodelist) == 4):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	501 expr2 = self.com_node(nodelist[3])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	502 else:
15378 9b1be1d84810 If a function contains a doc string, remove the doc string node from Jeremy Hylton <jeremy@alum.mit.edu> parents: 15329 diff changeset	503 expr2 = None
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	504 return Assert(expr1, expr2, lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	505
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	506 def if_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	507 # if: test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	508 tests = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	509 for i in range(0, len(nodelist) - 3, 4):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	510 testNode = self.com_node(nodelist[i + 1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	511 suiteNode = self.com_node(nodelist[i + 3])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	512 tests.append((testNode, suiteNode))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	513
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	514 if len(nodelist) % 4 == 3:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	515 elseNode = self.com_node(nodelist[-1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	516 ## elseNode.lineno = nodelist[-1][1][2]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	517 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	518 elseNode = None
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	519 return If(tests, elseNode, lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	520
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	521 def while_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	522 # 'while' test ':' suite ['else' ':' suite]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	523
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	524 testNode = self.com_node(nodelist[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	525 bodyNode = self.com_node(nodelist[3])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	526
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	527 if len(nodelist) > 4:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	528 elseNode = self.com_node(nodelist[6])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	529 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	530 elseNode = None
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	531
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	532 return While(testNode, bodyNode, elseNode, lineno=nodelist[0][2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	533
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	534 def for_stmt(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	535 # 'for' exprlist 'in' exprlist ':' suite ['else' ':' suite]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	536
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	537 assignNode = self.com_assign(nodelist[1], OP_ASSIGN)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	538 listNode = self.com_node(nodelist[3])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	539 bodyNode = self.com_node(nodelist[5])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	540
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	541 if len(nodelist) > 8:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	542 elseNode = self.com_node(nodelist[8])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	543 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	544 elseNode = None
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	545
33463 28ef5fe0b8b5 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 33423 diff changeset	546 return For(assignNode, listNode, bodyNode, elseNode,
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	547 lineno=nodelist[0][2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	548
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	549 def try_stmt(self, nodelist):
38900 e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	550 return self.com_try_except_finally(nodelist)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	551
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	552 def with_stmt(self, nodelist):
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	553 return self.com_with(nodelist)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	554
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	555 def with_var(self, nodelist):
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	556 return self.com_with_var(nodelist)
b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	557
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	558 def suite(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	559 # simple_stmt \| NEWLINE INDENT NEWLINE* (stmt NEWLINE*)+ DEDENT
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	560 if len(nodelist) == 1:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	561 return self.com_stmt(nodelist[0])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	562
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	563 stmts = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	564 for node in nodelist:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	565 if node[0] == symbol.stmt:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	566 self.com_append_stmt(stmts, node)
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	567 return Stmt(stmts)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	568
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	569 # --------------------------------------------------------------
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	570 #
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	571 # EXPRESSION NODES (invoked by com_node())
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	572 #
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	573
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	574 def testlist(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	575 # testlist: expr (',' expr)* [',']
20494 c8b0e9945159 Handle testlist_safe as if it were testlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19946 diff changeset	576 # testlist_safe: test [(',' test)+ [',']]
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	577 # exprlist: expr (',' expr)* [',']
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	578 return self.com_binary(Tuple, nodelist)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	579
20494 c8b0e9945159 Handle testlist_safe as if it were testlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19946 diff changeset	580 testlist_safe = testlist # XXX
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	581 testlist1 = testlist
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	582 exprlist = testlist
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	583
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	584 def testlist_comp(self, nodelist):
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	585 # test ( comp_for \| (',' test)* [','] )
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	586 assert nodelist[0][0] == symbol.test
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	587 if len(nodelist) == 2 and nodelist[1][0] == symbol.comp_for:
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	588 test = self.com_node(nodelist[0])
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	589 return self.com_generator_expression(test, nodelist[1])
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	590 return self.testlist(nodelist)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	591
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	592 def test(self, nodelist):
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	593 # or_test ['if' or_test 'else' test] \| lambdef
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	594 if len(nodelist) == 1 and nodelist[0][0] == symbol.lambdef:
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	595 return self.lambdef(nodelist[0])
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	596 then = self.com_node(nodelist[0])
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	597 if len(nodelist) > 1:
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	598 assert len(nodelist) == 5
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	599 assert nodelist[1][1] == 'if'
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	600 assert nodelist[3][1] == 'else'
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	601 test = self.com_node(nodelist[2])
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	602 else_ = self.com_node(nodelist[4])
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	603 return IfExp(test, then, else_, lineno=nodelist[1][2])
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	604 return then
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	605
c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	606 def or_test(self, nodelist):
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	607 # and_test ('or' and_test)* \| lambdef
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	608 if len(nodelist) == 1 and nodelist[0][0] == symbol.lambdef:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	609 return self.lambdef(nodelist[0])
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	610 return self.com_binary(Or, nodelist)
36820 c1c46210b4b7 Add support for absolute/relative imports and if/else expressions: Thomas Wouters <thomas@python.org> parents: 36798 diff changeset	611 old_test = or_test
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	612
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	613 def and_test(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	614 # not_test ('and' not_test)*
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	615 return self.com_binary(And, nodelist)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	616
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	617 def not_test(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	618 # 'not' not_test \| comparison
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	619 result = self.com_node(nodelist[-1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	620 if len(nodelist) == 2:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	621 return Not(result, lineno=nodelist[0][2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	622 return result
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	623
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	624 def comparison(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	625 # comparison: expr (comp_op expr)*
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	626 node = self.com_node(nodelist[0])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	627 if len(nodelist) == 1:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	628 return node
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	629
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	630 results = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	631 for i in range(2, len(nodelist), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	632 nl = nodelist[i-1]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	633
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	634 # comp_op: '<' \| '>' \| '=' \| '>=' \| '<=' \| '<>' \| '!=' \| '=='
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	635 # \| 'in' \| 'not' 'in' \| 'is' \| 'is' 'not'
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	636 n = nl[1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	637 if n[0] == token.NAME:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	638 type = n[1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	639 if len(nl) == 3:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	640 if type == 'not':
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	641 type = 'not in'
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	642 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	643 type = 'is not'
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	644 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	645 type = _cmp_types[n[0]]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	646
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	647 lineno = nl[1][2]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	648 results.append((type, self.com_node(nodelist[i])))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	649
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	650 # we need a special "compare" node so that we can distinguish
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	651 # 3 < x < 5 from (3 < x) < 5
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	652 # the two have very different semantics and results (note that the
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	653 # latter form is always true)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	654
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	655 return Compare(node, results, lineno=lineno)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	656
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	657 def expr(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	658 # xor_expr ('\|' xor_expr)*
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	659 return self.com_binary(Bitor, nodelist)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	660
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	661 def xor_expr(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	662 # xor_expr ('^' xor_expr)*
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	663 return self.com_binary(Bitxor, nodelist)
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	664
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	665 def and_expr(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	666 # xor_expr ('&' xor_expr)*
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	667 return self.com_binary(Bitand, nodelist)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	668
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	669 def shift_expr(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	670 # shift_expr ('<<'\|'>>' shift_expr)*
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	671 node = self.com_node(nodelist[0])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	672 for i in range(2, len(nodelist), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	673 right = self.com_node(nodelist[i])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	674 if nodelist[i-1][0] == token.LEFTSHIFT:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	675 node = LeftShift([node, right], lineno=nodelist[1][2])
19560 07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	676 elif nodelist[i-1][0] == token.RIGHTSHIFT:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	677 node = RightShift([node, right], lineno=nodelist[1][2])
19560 07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	678 else:
07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	679 raise ValueError, "unexpected token: %s" % nodelist[i-1][0]
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	680 return node
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	681
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	682 def arith_expr(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	683 node = self.com_node(nodelist[0])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	684 for i in range(2, len(nodelist), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	685 right = self.com_node(nodelist[i])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	686 if nodelist[i-1][0] == token.PLUS:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	687 node = Add([node, right], lineno=nodelist[1][2])
19560 07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	688 elif nodelist[i-1][0] == token.MINUS:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	689 node = Sub([node, right], lineno=nodelist[1][2])
19560 07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	690 else:
07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	691 raise ValueError, "unexpected token: %s" % nodelist[i-1][0]
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	692 return node
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	693
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	694 def term(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	695 node = self.com_node(nodelist[0])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	696 for i in range(2, len(nodelist), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	697 right = self.com_node(nodelist[i])
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	698 t = nodelist[i-1][0]
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	699 if t == token.STAR:
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	700 node = Mul([node, right])
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	701 elif t == token.SLASH:
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	702 node = Div([node, right])
19560 07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	703 elif t == token.PERCENT:
07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	704 node = Mod([node, right])
07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	705 elif t == token.DOUBLESLASH:
07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	706 node = FloorDiv([node, right])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	707 else:
19560 07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	708 raise ValueError, "unexpected token: %s" % t
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	709 node.lineno = nodelist[1][2]
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	710 return node
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	711
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	712 def factor(self, nodelist):
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	713 elt = nodelist[0]
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	714 t = elt[0]
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	715 node = self.lookup_node(nodelist[-1])(nodelist[-1][1:])
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	716 # need to handle (unary op)constant here...
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	717 if t == token.PLUS:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	718 return UnaryAdd(node, lineno=elt[2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	719 elif t == token.MINUS:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	720 return UnarySub(node, lineno=elt[2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	721 elif t == token.TILDE:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	722 node = Invert(node, lineno=elt[2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	723 return node
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	724
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	725 def power(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	726 # power: atom trailer* ('*' factor)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	727 node = self.com_node(nodelist[0])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	728 for i in range(1, len(nodelist)):
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	729 elt = nodelist[i]
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	730 if elt[0] == token.DOUBLESTAR:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	731 return Power([node, self.com_node(nodelist[i+1])],
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	732 lineno=elt[2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	733
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	734 node = self.com_apply_trailer(node, elt)
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	735
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	736 return node
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	737
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	738 def atom(self, nodelist):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	739 return self._atom_dispatch[nodelist[0][0]](nodelist)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	740
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	741 def atom_lpar(self, nodelist):
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	742 if nodelist[1][0] == token.RPAR:
38909 ebee5539308a Set lineno correctly on list, tuple and dict literals. Georg Brandl <georg@python.org> parents: 38900 diff changeset	743 return Tuple((), lineno=nodelist[0][2])
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	744 return self.com_node(nodelist[1])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	745
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	746 def atom_lsqb(self, nodelist):
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	747 if nodelist[1][0] == token.RSQB:
38909 ebee5539308a Set lineno correctly on list, tuple and dict literals. Georg Brandl <georg@python.org> parents: 38900 diff changeset	748 return List((), lineno=nodelist[0][2])
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	749 return self.com_list_constructor(nodelist[1])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	750
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	751 def atom_lbrace(self, nodelist):
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	752 if nodelist[1][0] == token.RBRACE:
38909 ebee5539308a Set lineno correctly on list, tuple and dict literals. Georg Brandl <georg@python.org> parents: 38900 diff changeset	753 return Dict((), lineno=nodelist[0][2])
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	754 return self.com_dictorsetmaker(nodelist[1])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	755
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	756 def atom_backquote(self, nodelist):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	757 return Backquote(self.com_node(nodelist[1]))
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 20494 diff changeset	758
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	759 def atom_number(self, nodelist):
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	760 ### need to verify this matches compile.c
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	761 k = eval(nodelist[0][1])
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	762 return Const(k, lineno=nodelist[0][2])
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 20494 diff changeset	763
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	764 def decode_literal(self, lit):
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	765 if self.encoding:
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	766 # this is particularly fragile & a bit of a
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	767 # hack... changes in compile.c:parsestr and
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	768 # tokenizer.c must be reflected here.
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	769 if self.encoding not in ['utf-8', 'iso-8859-1']:
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	770 lit = unicode(lit, 'utf-8').encode(self.encoding)
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	771 return eval("# coding: %s\n%s" % (self.encoding, lit))
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	772 else:
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	773 return eval(lit)
784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	774
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	775 def atom_string(self, nodelist):
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	776 k = ''
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	777 for node in nodelist:
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 23710 diff changeset	778 k += self.decode_literal(node[1])
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	779 return Const(k, lineno=nodelist[0][2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	780
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	781 def atom_name(self, nodelist):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	782 return Name(nodelist[0][1], lineno=nodelist[0][2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	783
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	784 # --------------------------------------------------------------
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	785 #
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	786 # INTERNAL PARSING UTILITIES
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	787 #
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	788
19510 ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	789 # The use of com_node() introduces a lot of extra stack frames,
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	790 # enough to cause a stack overflow compiling test.test_parser with
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	791 # the standard interpreter recursionlimit. The com_node() is a
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	792 # convenience function that hides the dispatch details, but comes
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	793 # at a very high cost. It is more efficient to dispatch directly
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	794 # in the callers. In these cases, use lookup_node() and call the
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	795 # dispatched node directly.
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	796
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	797 def lookup_node(self, node):
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	798 return self._dispatch[node[0]]
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	799
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	800 def com_node(self, node):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	801 # Note: compile.c has handling in com_node for del_stmt, pass_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	802 # break_stmt, stmt, small_stmt, flow_stmt, simple_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	803 # and compound_stmt.
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	804 # We'll just dispatch them.
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	805 return self._dispatch[node[0]](node[1:])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	806
17345 5afffca66e2f Fix "import as" (has always skipping the as name) Jeremy Hylton <jeremy@alum.mit.edu> parents: 15381 diff changeset	807 def com_NEWLINE(self, *args):
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	808 # A ';' at the end of a line can make a NEWLINE token appear
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	809 # here, Render it harmless. (genc discards ('discard',
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	810 # ('const', xxxx)) Nodes)
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	811 return Discard(Const(None))
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 20494 diff changeset	812
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	813 def com_arglist(self, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	814 # varargslist:
23179 6218828b0a11 Fix com_arglist() and update grammar fragment. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22089 diff changeset	815 # (fpdef ['=' test] ',')* ('' NAME [',' '' NAME] \| '*' NAME)
6218828b0a11 Fix com_arglist() and update grammar fragment. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22089 diff changeset	816 # \| fpdef ['=' test] (',' fpdef ['=' test])* [',']
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	817 # fpdef: NAME \| '(' fplist ')'
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	818 # fplist: fpdef (',' fpdef)* [',']
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	819 names = []
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	820 defaults = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	821 flags = 0
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	822
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	823 i = 0
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	824 while i < len(nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	825 node = nodelist[i]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	826 if node[0] == token.STAR or node[0] == token.DOUBLESTAR:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	827 if node[0] == token.STAR:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	828 node = nodelist[i+1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	829 if node[0] == token.NAME:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	830 names.append(node[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	831 flags = flags \| CO_VARARGS
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	832 i = i + 3
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	833
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	834 if i < len(nodelist):
23179 6218828b0a11 Fix com_arglist() and update grammar fragment. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22089 diff changeset	835 # should be DOUBLESTAR
19560 07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	836 t = nodelist[i][0]
07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	837 if t == token.DOUBLESTAR:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	838 node = nodelist[i+1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	839 else:
19560 07388a6a5526 Add support for // and //=. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19554 diff changeset	840 raise ValueError, "unexpected token: %s" % t
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	841 names.append(node[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	842 flags = flags \| CO_VARKEYWORDS
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	843
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	844 break
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	845
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	846 # fpdef: NAME \| '(' fplist ')'
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	847 names.append(self.com_fpdef(node))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	848
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	849 i = i + 1
38107 29425086e9ab Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package. Georg Brandl <georg@python.org> parents: 37408 diff changeset	850 if i < len(nodelist) and nodelist[i][0] == token.EQUAL:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	851 defaults.append(self.com_node(nodelist[i + 1]))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	852 i = i + 2
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	853 elif len(defaults):
38107 29425086e9ab Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package. Georg Brandl <georg@python.org> parents: 37408 diff changeset	854 # we have already seen an argument with default, but here
29425086e9ab Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package. Georg Brandl <georg@python.org> parents: 37408 diff changeset	855 # came one without
29425086e9ab Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package. Georg Brandl <georg@python.org> parents: 37408 diff changeset	856 raise SyntaxError, "non-default argument follows default argument"
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	857
38107 29425086e9ab Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package. Georg Brandl <georg@python.org> parents: 37408 diff changeset	858 # skip the comma
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	859 i = i + 1
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	860
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	861 return names, defaults, flags
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	862
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	863 def com_fpdef(self, node):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	864 # fpdef: NAME \| '(' fplist ')'
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	865 if node[1][0] == token.LPAR:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	866 return self.com_fplist(node[2])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	867 return node[1][1]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	868
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	869 def com_fplist(self, node):
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 20494 diff changeset	870 # fplist: fpdef (',' fpdef)* [',']
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	871 if len(node) == 2:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	872 return self.com_fpdef(node[1])
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	873 list = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	874 for i in range(1, len(node), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	875 list.append(self.com_fpdef(node[i]))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	876 return tuple(list)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	877
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	878 def com_dotted_name(self, node):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	879 # String together the dotted names and return the string
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	880 name = ""
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	881 for n in node:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	882 if type(n) == type(()) and n[0] == 1:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	883 name = name + n[1] + '.'
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	884 return name[:-1]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	885
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	886 def com_dotted_as_name(self, node):
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	887 assert node[0] == symbol.dotted_as_name
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	888 node = node[1:]
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	889 dot = self.com_dotted_name(node[0][1:])
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	890 if len(node) == 1:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	891 return dot, None
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	892 assert node[1][1] == 'as'
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	893 assert node[2][0] == token.NAME
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	894 return dot, node[2][1]
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	895
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	896 def com_dotted_as_names(self, node):
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	897 assert node[0] == symbol.dotted_as_names
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	898 node = node[1:]
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	899 names = [self.com_dotted_as_name(node[0])]
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	900 for i in range(2, len(node), 2):
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	901 names.append(self.com_dotted_as_name(node[i]))
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	902 return names
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	903
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	904 def com_import_as_name(self, node):
17345 5afffca66e2f Fix "import as" (has always skipping the as name) Jeremy Hylton <jeremy@alum.mit.edu> parents: 15381 diff changeset	905 assert node[0] == symbol.import_as_name
5afffca66e2f Fix "import as" (has always skipping the as name) Jeremy Hylton <jeremy@alum.mit.edu> parents: 15381 diff changeset	906 node = node[1:]
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	907 assert node[0][0] == token.NAME
17345 5afffca66e2f Fix "import as" (has always skipping the as name) Jeremy Hylton <jeremy@alum.mit.edu> parents: 15381 diff changeset	908 if len(node) == 1:
5afffca66e2f Fix "import as" (has always skipping the as name) Jeremy Hylton <jeremy@alum.mit.edu> parents: 15381 diff changeset	909 return node[0][1], None
5afffca66e2f Fix "import as" (has always skipping the as name) Jeremy Hylton <jeremy@alum.mit.edu> parents: 15381 diff changeset	910 assert node[1][1] == 'as', node
5afffca66e2f Fix "import as" (has always skipping the as name) Jeremy Hylton <jeremy@alum.mit.edu> parents: 15381 diff changeset	911 assert node[2][0] == token.NAME
5afffca66e2f Fix "import as" (has always skipping the as name) Jeremy Hylton <jeremy@alum.mit.edu> parents: 15381 diff changeset	912 return node[0][1], node[2][1]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	913
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	914 def com_import_as_names(self, node):
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	915 assert node[0] == symbol.import_as_names
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	916 node = node[1:]
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	917 names = [self.com_import_as_name(node[0])]
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	918 for i in range(2, len(node), 2):
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	919 names.append(self.com_import_as_name(node[i]))
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	920 return names
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	921
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	922 def com_bases(self, node):
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	923 bases = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	924 for i in range(1, len(node), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	925 bases.append(self.com_node(node[i]))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	926 return bases
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	927
38900 e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	928 def com_try_except_finally(self, nodelist):
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	929 # ('try' ':' suite
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	930 # ((except_clause ':' suite)+ ['else' ':' suite] ['finally' ':' suite]
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	931 # \| 'finally' ':' suite))
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13863 diff changeset	932
38900 e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	933 if nodelist[3][0] == token.NAME:
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	934 # first clause is a finally clause: only try-finally
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	935 return TryFinally(self.com_node(nodelist[2]),
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	936 self.com_node(nodelist[5]),
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	937 lineno=nodelist[0][2])
38945 095546ddb2f1 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 38909 diff changeset	938
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	939 #tryexcept: [TryNode, [except_clauses], elseNode)]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	940 clauses = []
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	941 elseNode = None
38900 e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	942 finallyNode = None
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	943 for i in range(3, len(nodelist), 3):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	944 node = nodelist[i]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	945 if node[0] == symbol.except_clause:
41773 f19e631be101 Backport PEP 3110's new 'except' syntax to 2.6. Collin Winter <collinw@gmail.com> parents: 40719 diff changeset	946 # except_clause: 'except' [expr [(',' \| 'as') expr]] */
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	947 if len(node) > 2:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	948 expr1 = self.com_node(node[2])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	949 if len(node) > 4:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	950 expr2 = self.com_assign(node[4], OP_ASSIGN)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	951 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	952 expr2 = None
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	953 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	954 expr1 = expr2 = None
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	955 clauses.append((expr1, expr2, self.com_node(nodelist[i+2])))
14359 35763be75ddb Update magic number. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13863 diff changeset	956
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	957 if node[0] == token.NAME:
38900 e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	958 if node[1] == 'else':
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	959 elseNode = self.com_node(nodelist[i+2])
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	960 elif node[1] == 'finally':
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	961 finallyNode = self.com_node(nodelist[i+2])
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	962 try_except = TryExcept(self.com_node(nodelist[2]), clauses, elseNode,
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	963 lineno=nodelist[0][2])
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	964 if finallyNode:
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	965 return TryFinally(try_except, finallyNode, lineno=nodelist[0][2])
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	966 else:
e3ac739d4889 fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally Georg Brandl <georg@python.org> parents: 38743 diff changeset	967 return try_except
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	968
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	969 def com_with(self, nodelist):
54337 16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	970 # with_stmt: 'with' with_item (',' with_item)* ':' suite
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	971 body = self.com_node(nodelist[-1])
54337 16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	972 for i in range(len(nodelist) - 3, 0, -2):
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	973 ret = self.com_with_item(nodelist[i], body, nodelist[0][2])
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	974 if i == 1:
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	975 return ret
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	976 body = ret
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	977
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	978 def com_with_item(self, nodelist, body, lineno):
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	979 # with_item: test ['as' expr]
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	980 if len(nodelist) == 4:
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	981 var = self.com_assign(nodelist[3], OP_ASSIGN)
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	982 else:
54337 16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	983 var = None
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	984 expr = self.com_node(nodelist[1])
16759f62eb22 Allow multiple context managers in one with statement, as proposed Georg Brandl <georg@python.org> parents: 50257 diff changeset	985 return With(expr, var, body, lineno=lineno)
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	986
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	987 def com_augassign_op(self, node):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	988 assert node[0] == symbol.augassign
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	989 return node[1]
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	990
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	991 def com_augassign(self, node):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	992 """Return node suitable for lvalue of augmented assignment
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	993
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	994 Names, slices, and attributes are the only allowable nodes.
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	995 """
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	996 l = self.com_node(node)
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	997 if l.__class__ in (Name, Slice, Subscript, Getattr):
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	998 return l
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	999 raise SyntaxError, "can't assign to %s" % l.__class__.__name__
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1000
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1001 def com_assign(self, node, assigning):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1002 # return a node suitable for use as an "lvalue"
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1003 # loop to avoid trivial recursion
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1004 while 1:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1005 t = node[0]
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1006 if t in (symbol.exprlist, symbol.testlist, symbol.testlist_safe, symbol.testlist_comp):
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1007 if len(node) > 2:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1008 return self.com_assign_tuple(node, assigning)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1009 node = node[1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1010 elif t in _assign_types:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1011 if len(node) > 2:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1012 raise SyntaxError, "can't assign to operator"
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1013 node = node[1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1014 elif t == symbol.power:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1015 if node[1][0] != symbol.atom:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1016 raise SyntaxError, "can't assign to operator"
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1017 if len(node) > 2:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1018 primary = self.com_node(node[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1019 for i in range(2, len(node)-1):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1020 ch = node[i]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1021 if ch[0] == token.DOUBLESTAR:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1022 raise SyntaxError, "can't assign to operator"
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1023 primary = self.com_apply_trailer(primary, ch)
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1024 return self.com_assign_trailer(primary, node[-1],
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 20494 diff changeset	1025 assigning)
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1026 node = node[1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1027 elif t == symbol.atom:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1028 t = node[1][0]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1029 if t == token.LPAR:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1030 node = node[2]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1031 if node[0] == token.RPAR:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1032 raise SyntaxError, "can't assign to ()"
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1033 elif t == token.LSQB:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1034 node = node[2]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1035 if node[0] == token.RSQB:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1036 raise SyntaxError, "can't assign to []"
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1037 return self.com_assign_list(node, assigning)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1038 elif t == token.NAME:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1039 return self.com_assign_name(node[1], assigning)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1040 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1041 raise SyntaxError, "can't assign to literal"
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1042 else:
36672 6c0b6c1cd1f4 Handle testlist_safe and or_test like testlist. Martin v. Löwis <martin@v.loewis.de> parents: 36671 diff changeset	1043 raise SyntaxError, "bad assignment (%s)" % t
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1044
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1045 def com_assign_tuple(self, node, assigning):
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1046 assigns = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1047 for i in range(1, len(node), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1048 assigns.append(self.com_assign(node[i], assigning))
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1049 return AssTuple(assigns, lineno=extractLineNo(node))
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1050
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1051 def com_assign_list(self, node, assigning):
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1052 assigns = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1053 for i in range(1, len(node), 2):
19943 6773dcfe34a3 Last set of change to get regression tests to pass Jeremy Hylton <jeremy@alum.mit.edu> parents: 19566 diff changeset	1054 if i + 1 < len(node):
6773dcfe34a3 Last set of change to get regression tests to pass Jeremy Hylton <jeremy@alum.mit.edu> parents: 19566 diff changeset	1055 if node[i + 1][0] == symbol.list_for:
6773dcfe34a3 Last set of change to get regression tests to pass Jeremy Hylton <jeremy@alum.mit.edu> parents: 19566 diff changeset	1056 raise SyntaxError, "can't assign to list comprehension"
6773dcfe34a3 Last set of change to get regression tests to pass Jeremy Hylton <jeremy@alum.mit.edu> parents: 19566 diff changeset	1057 assert node[i + 1][0] == token.COMMA, node[i + 1]
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1058 assigns.append(self.com_assign(node[i], assigning))
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1059 return AssList(assigns, lineno=extractLineNo(node))
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1060
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1061 def com_assign_name(self, node, assigning):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1062 return AssName(node[1], assigning, lineno=node[2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1063
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1064 def com_assign_trailer(self, primary, node, assigning):
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1065 t = node[1][0]
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1066 if t == token.DOT:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1067 return self.com_assign_attr(primary, node[2], assigning)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1068 if t == token.LSQB:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1069 return self.com_subscriptlist(primary, node[2], assigning)
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	1070 if t == token.LPAR:
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	1071 raise SyntaxError, "can't assign to function call"
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1072 raise SyntaxError, "unknown trailer type: %s" % t
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1073
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1074 def com_assign_attr(self, primary, node, assigning):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1075 return AssAttr(primary, node[1], assigning, lineno=node[-1])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1076
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	1077 def com_binary(self, constructor, nodelist):
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1078 "Compile 'NODE (OP NODE)*' into (type, [ node1, ..., nodeN ])."
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1079 l = len(nodelist)
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1080 if l == 1:
19510 ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	1081 n = nodelist[0]
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	1082 return self.lookup_node(n)(n[1:])
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1083 items = []
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1084 for i in range(0, l, 2):
19510 ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	1085 n = nodelist[i]
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	1086 items.append(self.lookup_node(n)(n[1:]))
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1087 return constructor(items, lineno=extractLineNo(nodelist))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1088
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1089 def com_stmt(self, node):
19510 ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	1090 result = self.lookup_node(node)(node[1:])
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1091 assert result is not None
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1092 if isinstance(result, Stmt):
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1093 return result
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1094 return Stmt([result])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1095
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1096 def com_append_stmt(self, stmts, node):
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1097 result = self.lookup_node(node)(node[1:])
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1098 assert result is not None
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1099 if isinstance(result, Stmt):
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1100 stmts.extend(result.nodes)
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1101 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1102 stmts.append(result)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1103
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1104 def com_list_constructor(self, nodelist):
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1105 # listmaker: test ( list_for \| (',' test)* [','] )
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1106 values = []
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1107 for i in range(1, len(nodelist)):
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1108 if nodelist[i][0] == symbol.list_for:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1109 assert len(nodelist[i:]) == 1
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1110 return self.com_list_comprehension(values[0],
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1111 nodelist[i])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1112 elif nodelist[i][0] == token.COMMA:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1113 continue
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1114 values.append(self.com_node(nodelist[i]))
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1115 return List(values, lineno=values[0].lineno)
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 20494 diff changeset	1116
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1117 def com_list_comprehension(self, expr, node):
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1118 return self.com_comprehension(expr, None, node, 'list')
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1119
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1120 def com_comprehension(self, expr1, expr2, node, type):
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1121 # list_iter: list_for \| list_if
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1122 # list_for: 'for' exprlist 'in' testlist [list_iter]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1123 # list_if: 'if' test [list_iter]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1124
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1125 # XXX should raise SyntaxError for assignment
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1126 # XXX(avassalotti) Set and dict comprehensions should have generator
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1127 # semantics. In other words, they shouldn't leak
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1128 # variables outside of the comprehension's scope.
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1129
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1130 lineno = node[1][2]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1131 fors = []
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1132 while node:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1133 t = node[1][1]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1134 if t == 'for':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1135 assignNode = self.com_assign(node[2], OP_ASSIGN)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1136 compNode = self.com_node(node[4])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1137 newfor = ListCompFor(assignNode, compNode, [])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1138 newfor.lineno = node[1][2]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1139 fors.append(newfor)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1140 if len(node) == 5:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1141 node = None
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1142 elif type == 'list':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1143 node = self.com_list_iter(node[5])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1144 else:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1145 node = self.com_comp_iter(node[5])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1146 elif t == 'if':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1147 test = self.com_node(node[2])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1148 newif = ListCompIf(test, lineno=node[1][2])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1149 newfor.ifs.append(newif)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1150 if len(node) == 3:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1151 node = None
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1152 elif type == 'list':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1153 node = self.com_list_iter(node[3])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1154 else:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1155 node = self.com_comp_iter(node[3])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1156 else:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1157 raise SyntaxError, \
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1158 ("unexpected comprehension element: %s %d"
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1159 % (node, lineno))
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1160 if type == 'list':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1161 return ListComp(expr1, fors, lineno=lineno)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1162 elif type == 'set':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1163 return SetComp(expr1, fors, lineno=lineno)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1164 elif type == 'dict':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1165 return DictComp(expr1, expr2, fors, lineno=lineno)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1166 else:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1167 raise ValueError("unexpected comprehension type: " + repr(type))
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	1168
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1169 def com_list_iter(self, node):
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1170 assert node[0] == symbol.list_iter
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1171 return node[1]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1172
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1173 def com_comp_iter(self, node):
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1174 assert node[0] == symbol.comp_iter
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1175 return node[1]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1176
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1177 def com_generator_expression(self, expr, node):
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1178 # comp_iter: comp_for \| comp_if
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1179 # comp_for: 'for' exprlist 'in' test [comp_iter]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1180 # comp_if: 'if' test [comp_iter]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1181
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1182 lineno = node[1][2]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1183 fors = []
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1184 while node:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1185 t = node[1][1]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1186 if t == 'for':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1187 assignNode = self.com_assign(node[2], OP_ASSIGN)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1188 genNode = self.com_node(node[4])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1189 newfor = GenExprFor(assignNode, genNode, [],
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1190 lineno=node[1][2])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1191 fors.append(newfor)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1192 if (len(node)) == 5:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1193 node = None
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	1194 else:
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1195 node = self.com_comp_iter(node[5])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1196 elif t == 'if':
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1197 test = self.com_node(node[2])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1198 newif = GenExprIf(test, lineno=node[1][2])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1199 newfor.ifs.append(newif)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1200 if len(node) == 3:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1201 node = None
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1202 else:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1203 node = self.com_comp_iter(node[3])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1204 else:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1205 raise SyntaxError, \
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1206 ("unexpected generator expression element: %s %d"
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1207 % (node, lineno))
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1208 fors[0].is_outmost = True
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1209 return GenExpr(GenExprInner(expr, fors), lineno=lineno)
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	1210
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1211 def com_dictorsetmaker(self, nodelist):
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1212 # dictorsetmaker: ( (test ':' test (comp_for \| (',' test ':' test)* [','])) \|
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1213 # (test (comp_for \| (',' test)* [','])) )
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1214 assert nodelist[0] == symbol.dictorsetmaker
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1215 nodelist = nodelist[1:]
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1216 if len(nodelist) == 1 or nodelist[1][0] == token.COMMA:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1217 # set literal
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1218 items = []
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1219 for i in range(0, len(nodelist), 2):
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1220 items.append(self.com_node(nodelist[i]))
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1221 return Set(items, lineno=items[0].lineno)
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1222 elif nodelist[1][0] == symbol.comp_for:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1223 # set comprehension
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1224 expr = self.com_node(nodelist[0])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1225 return self.com_comprehension(expr, None, nodelist[1], 'set')
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1226 elif len(nodelist) > 3 and nodelist[3][0] == symbol.comp_for:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1227 # dict comprehension
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1228 assert nodelist[1][0] == token.COLON
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1229 key = self.com_node(nodelist[0])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1230 value = self.com_node(nodelist[2])
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1231 return self.com_comprehension(key, value, nodelist[3], 'dict')
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1232 else:
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1233 # dict literal
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1234 items = []
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1235 for i in range(0, len(nodelist), 4):
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1236 items.append((self.com_node(nodelist[i]),
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1237 self.com_node(nodelist[i+2])))
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 54337 diff changeset	1238 return Dict(items, lineno=items[0][0].lineno)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1239
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1240 def com_apply_trailer(self, primaryNode, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1241 t = nodelist[1][0]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1242 if t == token.LPAR:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1243 return self.com_call_function(primaryNode, nodelist[2])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1244 if t == token.DOT:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1245 return self.com_select_member(primaryNode, nodelist[2])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1246 if t == token.LSQB:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1247 return self.com_subscriptlist(primaryNode, nodelist[2], OP_APPLY)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1248
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1249 raise SyntaxError, 'unknown node type: %s' % t
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1250
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1251 def com_select_member(self, primaryNode, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1252 if nodelist[0] != token.NAME:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1253 raise SyntaxError, "member must be a name"
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1254 return Getattr(primaryNode, nodelist[1], lineno=nodelist[2])
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1255
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1256 def com_call_function(self, primaryNode, nodelist):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1257 if nodelist[0] == token.RPAR:
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1258 return CallFunc(primaryNode, [], lineno=extractLineNo(nodelist))
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1259 args = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1260 kw = 0
48313 a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1261 star_node = dstar_node = None
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1262 len_nodelist = len(nodelist)
48313 a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1263 i = 1
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1264 while i < len_nodelist:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1265 node = nodelist[i]
48313 a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1266
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1267 if node[0]==token.STAR:
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1268 if star_node is not None:
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1269 raise SyntaxError, 'already have the varargs indentifier'
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1270 star_node = self.com_node(nodelist[i+1])
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1271 i = i + 3
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1272 continue
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1273 elif node[0]==token.DOUBLESTAR:
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1274 if dstar_node is not None:
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1275 raise SyntaxError, 'already have the kwargs indentifier'
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1276 dstar_node = self.com_node(nodelist[i+1])
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1277 i = i + 3
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1278 continue
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1279
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1280 # positional or named parameters
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1281 kw, result = self.com_argument(node, kw, star_node)
33719 f234be172800 This is jiwon's patch to fix: Michael W. Hudson <mwh@python.net> parents: 33463 diff changeset	1282
f234be172800 This is jiwon's patch to fix: Michael W. Hudson <mwh@python.net> parents: 33463 diff changeset	1283 if len_nodelist != 2 and isinstance(result, GenExpr) \
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1284 and len(node) == 3 and node[2][0] == symbol.comp_for:
33719 f234be172800 This is jiwon's patch to fix: Michael W. Hudson <mwh@python.net> parents: 33463 diff changeset	1285 # allow f(x for x in y), but reject f(x for x in y, 1)
f234be172800 This is jiwon's patch to fix: Michael W. Hudson <mwh@python.net> parents: 33463 diff changeset	1286 # should use f((x for x in y), 1) instead of f(x for x in y, 1)
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	1287 raise SyntaxError, 'generator expression needs parenthesis'
33719 f234be172800 This is jiwon's patch to fix: Michael W. Hudson <mwh@python.net> parents: 33463 diff changeset	1288
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1289 args.append(result)
48313 a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1290 i = i + 2
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1291
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1292 return CallFunc(primaryNode, args, star_node, dstar_node,
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1293 lineno=extractLineNo(nodelist))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1294
48313 a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1295 def com_argument(self, nodelist, kw, star_node):
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58229 diff changeset	1296 if len(nodelist) == 3 and nodelist[2][0] == symbol.comp_for:
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	1297 test = self.com_node(nodelist[1])
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 28513 diff changeset	1298 return 0, self.com_generator_expression(test, nodelist[2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1299 if len(nodelist) == 2:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1300 if kw:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1301 raise SyntaxError, "non-keyword arg after keyword arg"
48313 a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1302 if star_node:
a8f98a727371 follow-up of issue3473: update the compiler package to recognize the new syntax. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45520 diff changeset	1303 raise SyntaxError, "only named arguments may follow *expression"
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1304 return 0, self.com_node(nodelist[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1305 result = self.com_node(nodelist[3])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1306 n = nodelist[1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1307 while len(n) == 2 and n[0] != token.NAME:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1308 n = n[1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1309 if n[0] != token.NAME:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1310 raise SyntaxError, "keyword can't be an expression (%s)"%n[0]
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1311 node = Keyword(n[1], result, lineno=n[2])
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1312 return 1, node
12563 b87d75798d81 patches from Mark Hammond Jeremy Hylton <jeremy@alum.mit.edu> parents: 12007 diff changeset	1313
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1314 def com_subscriptlist(self, primary, nodelist, assigning):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1315 # slicing: simple_slicing \| extended_slicing
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1316 # simple_slicing: primary "[" short_slice "]"
20547 a12ccdbce8da Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 20494 diff changeset	1317 # extended_slicing: primary "[" slice_list "]"
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1318 # slice_list: slice_item ("," slice_item)* [","]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1319
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1320 # backwards compat slice for '[i:j]'
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1321 if len(nodelist) == 2:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1322 sub = nodelist[1]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1323 if (sub[1][0] == token.COLON or \
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1324 (len(sub) > 2 and sub[2][0] == token.COLON)) and \
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1325 sub[-1][0] != symbol.sliceop:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1326 return self.com_slice(primary, sub, assigning)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1327
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1328 subscripts = []
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1329 for i in range(1, len(nodelist), 2):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1330 subscripts.append(self.com_subscript(nodelist[i]))
33463 28ef5fe0b8b5 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 33423 diff changeset	1331 return Subscript(primary, assigning, subscripts,
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1332 lineno=extractLineNo(nodelist))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1333
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1334 def com_subscript(self, node):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1335 # slice_item: expression \| proper_slice \| ellipsis
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1336 ch = node[1]
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	1337 t = ch[0]
52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	1338 if t == token.DOT and node[2][0] == token.DOT:
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1339 return Ellipsis()
15381 52c27b711686 a few small optimizations that seem to give a 5-10% speedup; the Jeremy Hylton <jeremy@alum.mit.edu> parents: 15378 diff changeset	1340 if t == token.COLON or len(node) > 2:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1341 return self.com_sliceobj(node)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1342 return self.com_node(ch)
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1343
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1344 def com_sliceobj(self, node):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1345 # proper_slice: short_slice \| long_slice
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1346 # short_slice: [lower_bound] ":" [upper_bound]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1347 # long_slice: short_slice ":" [stride]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1348 # lower_bound: expression
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1349 # upper_bound: expression
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1350 # stride: expression
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1351 #
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1352 # Note: a stride may be further slicing...
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1353
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1354 items = []
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1355
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1356 if node[1][0] == token.COLON:
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1357 items.append(Const(None))
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1358 i = 2
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1359 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1360 items.append(self.com_node(node[1]))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1361 # i == 2 is a COLON
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1362 i = 3
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1363
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1364 if i < len(node) and node[i][0] == symbol.test:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1365 items.append(self.com_node(node[i]))
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1366 i = i + 1
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1367 else:
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1368 items.append(Const(None))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1369
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1370 # a short_slice has been built. look for long_slice now by looking
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1371 # for strides...
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1372 for j in range(i, len(node)):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1373 ch = node[j]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1374 if len(ch) == 2:
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1375 items.append(Const(None))
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1376 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1377 items.append(self.com_node(ch[2]))
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1378 return Sliceobj(items, lineno=extractLineNo(node))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1379
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1380 def com_slice(self, primary, node, assigning):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1381 # short_slice: [lower_bound] ":" [upper_bound]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1382 lower = upper = None
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1383 if len(node) == 3:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1384 if node[1][0] == token.COLON:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1385 upper = self.com_node(node[2])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1386 else:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1387 lower = self.com_node(node[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1388 elif len(node) == 4:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1389 lower = self.com_node(node[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1390 upper = self.com_node(node[3])
33421 b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1391 return Slice(primary, assigning, lower, upper,
b6e875aa508b compiler.transformer: correct lineno attribute when possible Jeremy Hylton <jeremy@alum.mit.edu> parents: 33353 diff changeset	1392 lineno=extractLineNo(node))
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1393
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1394 def get_docstring(self, node, n=None):
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1395 if n is None:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1396 n = node[0]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1397 node = node[1:]
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1398 if n == symbol.suite:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1399 if len(node) == 1:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1400 return self.get_docstring(node[0])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1401 for sub in node:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1402 if sub[0] == symbol.stmt:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1403 return self.get_docstring(sub)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1404 return None
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1405 if n == symbol.file_input:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1406 for sub in node:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1407 if sub[0] == symbol.stmt:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1408 return self.get_docstring(sub)
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1409 return None
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1410 if n == symbol.atom:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1411 if node[0][0] == token.STRING:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1412 s = ''
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1413 for t in node:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1414 s = s + eval(t[1])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1415 return s
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1416 return None
15329 5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1417 if n == symbol.stmt or n == symbol.simple_stmt \
5d586d45cb5a Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15205 diff changeset	1418 or n == symbol.small_stmt:
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1419 return self.get_docstring(node[0])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1420 if n in _doc_nodes and len(node) == 1:
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1421 return self.get_docstring(node[0])
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1422 return None
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1423
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1424
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1425 _doc_nodes = [
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1426 symbol.expr_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1427 symbol.testlist,
20494 c8b0e9945159 Handle testlist_safe as if it were testlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19946 diff changeset	1428 symbol.testlist_safe,
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1429 symbol.test,
39258 6c8bc7cd72a6 Bug #1441397: The compiler module now recognizes module and function Georg Brandl <georg@python.org> parents: 38945 diff changeset	1430 symbol.or_test,
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1431 symbol.and_test,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1432 symbol.not_test,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1433 symbol.comparison,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1434 symbol.expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1435 symbol.xor_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1436 symbol.and_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1437 symbol.shift_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1438 symbol.arith_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1439 symbol.term,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1440 symbol.factor,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1441 symbol.power,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1442 ]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1443
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1444 # comp_op: '<' \| '>' \| '=' \| '>=' \| '<=' \| '<>' \| '!=' \| '=='
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1445 # \| 'in' \| 'not' 'in' \| 'is' \| 'is' 'not'
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1446 _cmp_types = {
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1447 token.LESS : '<',
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1448 token.GREATER : '>',
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1449 token.EQEQUAL : '==',
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1450 token.EQUAL : '==',
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1451 token.LESSEQUAL : '<=',
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1452 token.GREATEREQUAL : '>=',
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1453 token.NOTEQUAL : '!=',
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1454 }
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1455
34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1456 _legal_node_types = [
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1457 symbol.funcdef,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1458 symbol.classdef,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1459 symbol.stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1460 symbol.small_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1461 symbol.flow_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1462 symbol.simple_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1463 symbol.compound_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1464 symbol.expr_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1465 symbol.print_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1466 symbol.del_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1467 symbol.pass_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1468 symbol.break_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1469 symbol.continue_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1470 symbol.return_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1471 symbol.raise_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1472 symbol.import_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1473 symbol.global_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1474 symbol.exec_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1475 symbol.assert_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1476 symbol.if_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1477 symbol.while_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1478 symbol.for_stmt,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1479 symbol.try_stmt,
36706 b6b1c44d9110 Update the compiler package to compile the with-statement. Guido van Rossum <guido@python.org> parents: 36691 diff changeset	1480 symbol.with_stmt,
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1481 symbol.suite,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1482 symbol.testlist,
20494 c8b0e9945159 Handle testlist_safe as if it were testlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 19946 diff changeset	1483 symbol.testlist_safe,
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1484 symbol.test,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1485 symbol.and_test,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1486 symbol.not_test,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1487 symbol.comparison,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1488 symbol.exprlist,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1489 symbol.expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1490 symbol.xor_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1491 symbol.and_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1492 symbol.shift_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1493 symbol.arith_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1494 symbol.term,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1495 symbol.factor,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1496 symbol.power,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1497 symbol.atom,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1498 ]
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1499
19510 ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	1500 if hasattr(symbol, 'yield_stmt'):
ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	1501 _legal_node_types.append(symbol.yield_stmt)
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35192 diff changeset	1502 if hasattr(symbol, 'yield_expr'):
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35192 diff changeset	1503 _legal_node_types.append(symbol.yield_expr)
19510 ce319b82a8e4 Add lookup_name() to optimize use of stack frames Jeremy Hylton <jeremy@alum.mit.edu> parents: 19358 diff changeset	1504
11703 34f53c36ba9a three files from the p2c cvs tree. the message here indicates the Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1505 _assign_types = [
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1506 symbol.test,
36691 dd3e5a945962 Make or_test similar to test, not testlist. Martin v. Löwis <martin@v.loewis.de> parents: 36672 diff changeset	1507 symbol.or_test,
14702 91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1508 symbol.and_test,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1509 symbol.not_test,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1510 symbol.comparison,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1511 symbol.expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1512 symbol.xor_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1513 symbol.and_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1514 symbol.shift_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1515 symbol.arith_expr,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1516 symbol.term,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1517 symbol.factor,
91dde7bffe7d change 2-space indent to 4-space indent Jeremy Hylton <jeremy@alum.mit.edu> parents: 14359 diff changeset	1518 ]
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1519
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1520 _names = {}
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1521 for k, v in symbol.sym_name.items():
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1522 _names[k] = v
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1523 for k, v in token.tok_name.items():
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1524 _names[k] = v
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1525
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1526 def debug_tree(tree):
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1527 l = []
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1528 for elt in tree:
35948 ef608b58bfd8 Remove unused _callers member. No need for types, use isinstance Neal Norwitz <nnorwitz@gmail.com> parents: 35298 diff changeset	1529 if isinstance(elt, int):
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1530 l.append(_names.get(elt, elt))
35948 ef608b58bfd8 Remove unused _callers member. No need for types, use isinstance Neal Norwitz <nnorwitz@gmail.com> parents: 35298 diff changeset	1531 elif isinstance(elt, str):
15205 04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1532 l.append(elt)
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1533 else:
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1534 l.append(debug_tree(elt))
04e76e08e10f Now supports entire Python 2.0 language and still supports Python Jeremy Hylton <jeremy@alum.mit.edu> parents: 15185 diff changeset	1535 return l

Mercurial > cpython-lru_cache-weakref

annotate Lib/compiler/transformer.py @ 79675:c0a2294de787 2.7