Mercurial > genshi > mirror

annotate markup/eval.py @ 145:47bbd9d2a5af trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fix error in expression evaluation when the expression evaluates to an iterable that does not produce event tuples. * The first location step in path expressions longer assumes the `descendant::` axis, but rather the `child::` axis. * Import cleanups.
author cmlenz
date Tue, 15 Aug 2006 09:52:47 +0000
parents 8ad716b4180d
children 54a4be707664
rev   line source
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
1 # -*- coding: utf-8 -*-
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
2 #
66
59eb24184e9c Switch copyright to Edgewall and URLs to markup.edgewall.org.
cmlenz
parents: 42
diff changeset
3 # Copyright (C) 2006 Edgewall Software
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
4 # All rights reserved.
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
5 #
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
6 # This software is licensed as described in the file COPYING, which
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
7 # you should have received as part of this distribution. The terms
66
59eb24184e9c Switch copyright to Edgewall and URLs to markup.edgewall.org.
cmlenz
parents: 42
diff changeset
8 # are also available at http://markup.edgewall.org/wiki/License.
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
9 #
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
10 # This software consists of voluntary contributions made by many
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
11 # individuals. For the exact contribution history, see the revision
66
59eb24184e9c Switch copyright to Edgewall and URLs to markup.edgewall.org.
cmlenz
parents: 42
diff changeset
12 # history and logs, available at http://markup.edgewall.org/log/.
27
b4f78c05e5c9 * Fix the boilerplate in the Python source files.
cmlenz
parents: 16
diff changeset
13
b4f78c05e5c9 * Fix the boilerplate in the Python source files.
cmlenz
parents: 16
diff changeset
14 """Support for "safe" evaluation of Python expressions."""
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
15
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
16 import __builtin__
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
17 from compiler import ast, parse
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
18 from compiler.pycodegen import ExpressionCodeGenerator
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
19 import new
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
20
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
21 __all__ = ['Expression']
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
22
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
23
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
24 class Expression(object):
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
25 """Evaluates Python expressions used in templates.
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
26
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
27 >>> data = dict(test='Foo', items=[1, 2, 3], dict={'some': 'thing'})
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
28 >>> Expression('test').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
29 'Foo'
81
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
30
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
31 >>> Expression('items[0]').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
32 1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
33 >>> Expression('items[-1]').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
34 3
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
35 >>> Expression('dict["some"]').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
36 'thing'
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
37
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
38 Similar to e.g. Javascript, expressions in templates can use the dot
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
39 notation for attribute access to access items in mappings:
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
40
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
41 >>> Expression('dict.some').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
42 'thing'
86
a54ebae77330 Accidentially left some doctests disabled.
cmlenz
parents: 82
diff changeset
43
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
44 This also works the other way around: item access can be used to access
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
45 any object attribute (meaning there's no use for `getattr()` in templates):
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
46
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
47 >>> class MyClass(object):
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
48 ... myattr = 'Bar'
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
49 >>> data = dict(mine=MyClass(), key='myattr')
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
50 >>> Expression('mine.myattr').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
51 'Bar'
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
52 >>> Expression('mine["myattr"]').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
53 'Bar'
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
54 >>> Expression('mine[key]').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
55 'Bar'
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
56
31
2ab5fa60575d * More test cases for expression evaluation.
cmlenz
parents: 30
diff changeset
57 All of the standard Python operators are available to template expressions.
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
58 Built-in functions such as `len()` are also available in template
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
59 expressions:
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
60
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
61 >>> data = dict(items=[1, 2, 3])
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
62 >>> Expression('len(items)').evaluate(data)
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
63 3
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
64 """
81
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
65 __slots__ = ['source', 'code']
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
66
81
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
67 def __init__(self, source, filename=None, lineno=-1):
27
b4f78c05e5c9 * Fix the boilerplate in the Python source files.
cmlenz
parents: 16
diff changeset
68 """Create the expression.
b4f78c05e5c9 * Fix the boilerplate in the Python source files.
cmlenz
parents: 16
diff changeset
69
b4f78c05e5c9 * Fix the boilerplate in the Python source files.
cmlenz
parents: 16
diff changeset
70 @param source: the expression as string
b4f78c05e5c9 * Fix the boilerplate in the Python source files.
cmlenz
parents: 16
diff changeset
71 """
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
72 self.source = source
134
d681d2c3cd8d * Improve the accuracy of line numbers for text nodes, so that reported errors about syntax or evaluation errors in expressions point to the right line (not quite perfect yet, though).
cmlenz
parents: 133
diff changeset
73 self.code = _compile(self, filename, lineno)
1
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
74
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
75 def __repr__(self):
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
76 return '<Expression "%s">' % self.source
5479aae32f5a Initial import.
cmlenz
parents:
diff changeset
77
120
c9f0a26e28a2 * Allow `py:with` directives to define `lambda`s
cmlenz
parents: 118
diff changeset
78 def evaluate(self, data, nocall=False):
81
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
79 """Evaluate the expression against the given data dictionary.
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
80
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
81 @param data: a mapping containing the data to evaluate against
120
c9f0a26e28a2 * Allow `py:with` directives to define `lambda`s
cmlenz
parents: 118
diff changeset
82 @param nocall: if true, the result of the evaluation is not called if
c9f0a26e28a2 * Allow `py:with` directives to define `lambda`s
cmlenz
parents: 118
diff changeset
83 if it is a callable
81
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
84 @return: the result of the evaluation
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
85 """
118
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
86 retval = eval(self.code, {'data': data,
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
87 '_lookup_name': _lookup_name,
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
88 '_lookup_attr': _lookup_attr,
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
89 '_lookup_item': _lookup_item})
120
c9f0a26e28a2 * Allow `py:with` directives to define `lambda`s
cmlenz
parents: 118
diff changeset
90 if not nocall and callable(retval):
90
c835e81c50af When an expression evaluates to a callable, it is called implicitly.
cmlenz
parents: 88
diff changeset
91 retval = retval()
c835e81c50af When an expression evaluates to a callable, it is called implicitly.
cmlenz
parents: 88
diff changeset
92 return retval
30
bcdbb7e5e4e5 Experimental support for using the new native AST in Python 2.5 instead of the `compiler` package.
cmlenz
parents: 27
diff changeset
93
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
94
134
d681d2c3cd8d * Improve the accuracy of line numbers for text nodes, so that reported errors about syntax or evaluation errors in expressions point to the right line (not quite perfect yet, though).
cmlenz
parents: 133
diff changeset
95 def _compile(expr, filename=None, lineno=-1):
138
8ad716b4180d Add some more assertions to the XPath tests.
cmlenz
parents: 134
diff changeset
96 tree = ExpressionASTTransformer().visit(parse(expr.source, 'eval'))
116
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
97 if isinstance(filename, unicode):
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
98 # unicode file names not allowed for code objects
116
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
99 filename = filename.encode('utf-8', 'replace')
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
100 elif not filename:
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
101 filename = '<string>'
132
dc42cb3c02dc Name lookup in expressions: try locals first, then the context.
cmlenz
parents: 131
diff changeset
102 tree.filename = filename
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
103 if lineno <= 0:
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
104 lineno = 1
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
105
116
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
106 gen = ExpressionCodeGenerator(tree)
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
107 gen.optimized = True
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
108 code = gen.getCode()
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
109
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
110 # We'd like to just set co_firstlineno, but it's readonly. So we need to
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
111 # clone the code object while adjusting the line number
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
112 return new.code(0, code.co_nlocals, code.co_stacksize,
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
113 code.co_flags | 0x0040, code.co_code, code.co_consts,
134
d681d2c3cd8d * Improve the accuracy of line numbers for text nodes, so that reported errors about syntax or evaluation errors in expressions point to the right line (not quite perfect yet, though).
cmlenz
parents: 133
diff changeset
114 code.co_names, code.co_varnames, filename, repr(expr),
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
115 lineno, code.co_lnotab, (), ())
116
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
116
132
dc42cb3c02dc Name lookup in expressions: try locals first, then the context.
cmlenz
parents: 131
diff changeset
117 def _lookup_name(data, name, locals_=None):
dc42cb3c02dc Name lookup in expressions: try locals first, then the context.
cmlenz
parents: 131
diff changeset
118 val = None
dc42cb3c02dc Name lookup in expressions: try locals first, then the context.
cmlenz
parents: 131
diff changeset
119 if locals_:
dc42cb3c02dc Name lookup in expressions: try locals first, then the context.
cmlenz
parents: 131
diff changeset
120 val = locals_.get(name)
dc42cb3c02dc Name lookup in expressions: try locals first, then the context.
cmlenz
parents: 131
diff changeset
121 if val is None:
dc42cb3c02dc Name lookup in expressions: try locals first, then the context.
cmlenz
parents: 131
diff changeset
122 val = data.get(name)
116
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
123 if val is None:
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
124 val = getattr(__builtin__, name, None)
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
125 return val
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
126
118
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
127 def _lookup_attr(data, obj, key):
116
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
128 if hasattr(obj, key):
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
129 return getattr(obj, key)
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
130 try:
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
131 return obj[key]
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
132 except (KeyError, TypeError):
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
133 return None
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
134
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
135 def _lookup_item(data, obj, key):
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
136 if len(key) == 1:
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
137 key = key[0]
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
138 try:
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
139 return obj[key]
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
140 except (KeyError, IndexError, TypeError), e:
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
141 if isinstance(key, basestring):
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
142 try:
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
143 return getattr(obj, key)
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
144 except (AttributeError, TypeError), e:
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
145 pass
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
146
138
8ad716b4180d Add some more assertions to the XPath tests.
cmlenz
parents: 134
diff changeset
147
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
148 class ASTTransformer(object):
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
149 """General purpose base class for AST transformations.
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
150
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
151 Every visitor method can be overridden to return an AST node that has been
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
152 altered or replaced in some way.
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
153 """
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
154 _visitors = {}
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
155
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
156 def visit(self, node, *args, **kwargs):
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
157 v = self._visitors.get(node.__class__)
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
158 if not v:
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
159 v = getattr(self, 'visit%s' % node.__class__.__name__)
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
160 self._visitors[node.__class__] = v
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
161 return v(node, *args, **kwargs)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
162
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
163 def visitExpression(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
164 node.node = self.visit(node.node, *args, **kwargs)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
165 return node
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
166
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
167 # Functions & Accessors
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
168
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
169 def visitCallFunc(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
170 node.node = self.visit(node.node, *args, **kwargs)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
171 node.args = map(lambda x: self.visit(x, *args, **kwargs), node.args)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
172 if node.star_args:
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
173 node.star_args = map(lambda x: self.visit(x, *args, **kwargs),
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
174 node.star_args)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
175 if node.dstar_args:
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
176 node.dstart_args = map(lambda x: self.visit(x, *args, **kwargs),
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
177 node.dstar_args)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
178 return node
30
bcdbb7e5e4e5 Experimental support for using the new native AST in Python 2.5 instead of the `compiler` package.
cmlenz
parents: 27
diff changeset
179
118
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
180 def visitLambda(self, node, *args, **kwargs):
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
181 node.code = self.visit(node.code, *args, **kwargs)
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
182 node.filename = '<string>' # workaround for bug in pycodegen
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
183 return node
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
184
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
185 def visitGetattr(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
186 node.expr = self.visit(node.expr, *args, **kwargs)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
187 return node
30
bcdbb7e5e4e5 Experimental support for using the new native AST in Python 2.5 instead of the `compiler` package.
cmlenz
parents: 27
diff changeset
188
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
189 def visitSubscript(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
190 node.expr = self.visit(node.expr, *args, **kwargs)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
191 node.subs = map(lambda x: self.visit(x, *args, **kwargs), node.subs)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
192 return node
30
bcdbb7e5e4e5 Experimental support for using the new native AST in Python 2.5 instead of the `compiler` package.
cmlenz
parents: 27
diff changeset
193
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
194 # Operators
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
195
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
196 def _visitBoolOp(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
197 node.nodes = map(lambda x: self.visit(x, *args, **kwargs), node.nodes)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
198 return node
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
199 visitAnd = visitOr = visitBitand = visitBitor = _visitBoolOp
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
200
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
201 def _visitBinOp(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
202 node.left = self.visit(node.left, *args, **kwargs)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
203 node.right = self.visit(node.right, *args, **kwargs)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
204 return node
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
205 visitAdd = visitSub = _visitBinOp
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
206 visitDiv = visitFloorDiv = visitMod = visitMul = visitPower = _visitBinOp
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
207 visitLeftShift = visitRightShift = _visitBinOp
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
208
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
209 def visitCompare(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
210 node.expr = self.visit(node.expr, *args, **kwargs)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
211 node.ops = map(lambda (op, n): (op, self.visit(n, *args, **kwargs)),
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
212 node.ops)
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
213 return node
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
214
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
215 def _visitUnaryOp(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
216 node.expr = self.visit(node.expr, *args, **kwargs)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
217 return node
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
218 visitUnaryAdd = visitUnarySub = visitNot = visitInvert = _visitUnaryOp
98
44af12832c5a Bugfix in `builder` module: attribute values need to be converted to strings when generating streams.
cmlenz
parents: 90
diff changeset
219 visitBackquote = _visitUnaryOp
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
220
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
221 # Identifiers, Literals and Comprehensions
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
222
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
223 def _visitDefault(self, node, *args, **kwargs):
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
224 return node
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
225 visitAssName = visitAssTuple = _visitDefault
102
e20a153cc20c Ported [118] to trunk
jonas
parents: 101
diff changeset
226 visitConst = visitName = _visitDefault
e20a153cc20c Ported [118] to trunk
jonas
parents: 101
diff changeset
227
e20a153cc20c Ported [118] to trunk
jonas
parents: 101
diff changeset
228 def visitKeyword(self, node, *args, **kwargs):
e20a153cc20c Ported [118] to trunk
jonas
parents: 101
diff changeset
229 node.expr = self.visit(node.expr, *args, **kwargs)
e20a153cc20c Ported [118] to trunk
jonas
parents: 101
diff changeset
230 return node
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
231
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
232 def visitDict(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
233 node.items = map(lambda (k, v): (self.visit(k, *args, **kwargs),
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
234 self.visit(v, *args, **kwargs)),
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
235 node.items)
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
236 return node
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
237
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
238 def visitTuple(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
239 node.nodes = map(lambda n: self.visit(n, *args, **kwargs), node.nodes)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
240 return node
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
241
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
242 def visitList(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
243 node.nodes = map(lambda n: self.visit(n, *args, **kwargs), node.nodes)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
244 return node
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
245
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
246 def visitListComp(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
247 node.expr = self.visit(node.expr, *args, **kwargs)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
248 node.quals = map(lambda x: self.visit(x, *args, **kwargs), node.quals)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
249 return node
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
250
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
251 def visitListCompFor(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
252 node.assign = self.visit(node.assign, *args, **kwargs)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
253 node.list = self.visit(node.list, *args, **kwargs)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
254 node.ifs = map(lambda x: self.visit(x, *args, **kwargs), node.ifs)
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
255 return node
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
256
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
257 def visitListCompIf(self, node, *args, **kwargs):
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
258 node.test = self.visit(node.test, *args, **kwargs)
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
259 return node
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
260
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
261
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
262 class ExpressionASTTransformer(ASTTransformer):
112
5f9af749341c Docstring typo fix.
cmlenz
parents: 102
diff changeset
263 """Concrete AST transformer that implements the AST transformations needed
5f9af749341c Docstring typo fix.
cmlenz
parents: 102
diff changeset
264 for template expressions.
87
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
265 """
1b874f032bde Fix some problems in expression evaluation by transforming the AST and compiling that to bytecode, instead of generating bytecode directly. Invalidates #13.
cmlenz
parents: 86
diff changeset
266
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
267 def visitGetattr(self, node, locals_=False):
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
268 return ast.CallFunc(ast.Name('_lookup_attr'), [
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
269 ast.Name('data'), self.visit(node.expr, locals_=locals_),
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
270 ast.Const(node.attrname)
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
271 ])
30
bcdbb7e5e4e5 Experimental support for using the new native AST in Python 2.5 instead of the `compiler` package.
cmlenz
parents: 27
diff changeset
272
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
273 def visitLambda(self, node, locals_=False):
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
274 node.code = self.visit(node.code, locals_=True)
118
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
275 node.filename = '<string>' # workaround for bug in pycodegen
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
276 return node
c392d38694d9 Add basic support for using `lambda`s in expressions. Closes #21. (Not sure about default arguments, need a test case).
cmlenz
parents: 116
diff changeset
277
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
278 def visitListComp(self, node, locals_=False):
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
279 node.expr = self.visit(node.expr, locals_=True)
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
280 node.quals = map(lambda x: self.visit(x, locals_=True), node.quals)
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
281 return node
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
282
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
283 def visitName(self, node, locals_=False):
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
284 func_args = [ast.Name('data'), ast.Const(node.name)]
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
285 if locals_:
88
628ba9ed39ef Add support for list comprehension in expressions (see #12).
cmlenz
parents: 87
diff changeset
286 func_args.append(ast.CallFunc(ast.Name('locals'), []))
116
c77c113846d6 Merged [135:138/branches/experimental/cspeedups].
cmlenz
parents: 112
diff changeset
287 return ast.CallFunc(ast.Name('_lookup_name'), func_args)
81
d60486018004 Template expressions are now compiled to Python bytecode.
cmlenz
parents: 69
diff changeset
288
131
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
289 def visitSubscript(self, node, locals_=False):
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
290 return ast.CallFunc(ast.Name('_lookup_item'), [
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
291 ast.Name('data'), self.visit(node.expr, locals_=locals_),
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
292 ast.Tuple(map(lambda x: self.visit(x, locals_=locals_), node.subs))
2ad83f1d337c * Support for line numbers in exceptions in expression evaluation (#22).
cmlenz
parents: 120
diff changeset
293 ])
Copyright (C) 2012-2017 Edgewall Software