Skip to content
Browse files

fixed an issue with unary operators having the wrong precendence.

--HG--
branch : trunk
  • Loading branch information...
1 parent 2613e5a commit 2ee64bc4020f83215399ad6c207d7cc4e744ffbd @mitsuhiko committed
Showing with 20 additions and 13 deletions.
  1. +1 −0 CHANGES
  2. +12 −12 jinja2/parser.py
  3. +7 −1 jinja2/testsuite/lexnparse.py
View
1 CHANGES
@@ -18,6 +18,7 @@ Version 2.5.1
pulled from markupsafe by the Jinja2 developers. The debug support
went into a separate feature called "debugsupport" and is disabled
by default because it is only relevant for Python 2.4
+- fixed an issue with unary operators having the wrong precendence.
Version 2.5
-----------
View
24 jinja2/parser.py
@@ -370,7 +370,7 @@ def parse_assign_target(self, with_tuple=True, name_only=False,
target = self.parse_tuple(simplified=True,
extra_end_rules=extra_end_rules)
else:
- target = self.parse_primary(with_postfix=False)
+ target = self.parse_primary()
target.set_ctx('store')
if not target.can_assign():
self.fail('can\'t assign to %r' % target.__class__.
@@ -525,20 +525,22 @@ def parse_pow(self):
lineno = self.stream.current.lineno
return left
- def parse_unary(self):
+ def parse_unary(self, with_postfix=True):
token_type = self.stream.current.type
lineno = self.stream.current.lineno
if token_type == 'sub':
next(self.stream)
- node = self.parse_unary()
- return nodes.Neg(node, lineno=lineno)
- if token_type == 'add':
+ node = nodes.Neg(self.parse_unary(False), lineno=lineno)
+ elif token_type == 'add':
next(self.stream)
- node = self.parse_unary()
- return nodes.Pos(node, lineno=lineno)
- return self.parse_primary()
+ node = nodes.Pos(self.parse_unary(False), lineno=lineno)
+ else:
+ node = self.parse_primary()
+ if with_postfix:
+ node = self.parse_postfix(node)
+ return node
- def parse_primary(self, with_postfix=True):
+ def parse_primary(self):
token = self.stream.current
if token.type == 'name':
if token.value in ('true', 'false', 'True', 'False'):
@@ -570,8 +572,6 @@ def parse_primary(self, with_postfix=True):
node = self.parse_dict()
else:
self.fail("unexpected '%s'" % describe_token(token), token.lineno)
- if with_postfix:
- node = self.parse_postfix(node)
return node
def parse_tuple(self, simplified=False, with_condexpr=True,
@@ -596,7 +596,7 @@ def parse_tuple(self, simplified=False, with_condexpr=True,
"""
lineno = self.stream.current.lineno
if simplified:
- parse = lambda: self.parse_primary(with_postfix=False)
+ parse = self.parse_primary
elif with_condexpr:
parse = self.parse_expression
else:
View
8 jinja2/testsuite/lexnparse.py
@@ -16,7 +16,8 @@
from jinja2.testsuite import JinjaTestCase
-from jinja2 import Environment, Template, TemplateSyntaxError, UndefinedError
+from jinja2 import Environment, Template, TemplateSyntaxError, \
+ UndefinedError, nodes
env = Environment()
@@ -357,6 +358,11 @@ def test_const(self):
'{{ none is defined }}|{{ missing is defined }}')
assert tmpl.render() == 'True|False|None|True|False'
+ def test_neg_filter_priority(self):
+ node = env.parse('{{ -1|foo }}')
+ assert isinstance(node.body[0].nodes[0], nodes.Filter)
+ assert isinstance(node.body[0].nodes[0].node, nodes.Neg)
+
def test_const_assign(self):
constass1 = '''{% set true = 42 %}'''
constass2 = '''{% for none in seq %}{% endfor %}'''

0 comments on commit 2ee64bc

Please sign in to comment.
Something went wrong with that request. Please try again.