Fix parsing of the ** operator

diff --git a/grammar.ebnf b/grammar.ebnf
index 2d1406a338d021785d222dab47f8b52390e0f07e..8620f99422fe52328b50518bf44bfe392e3b81ff 100644 (file)
--- a/grammar.ebnf
+++ b/grammar.ebnf
@@ -254,7 +254,7 @@ conditional_expression
 \r
 complex_expression_powers\r
     =\r
-    left:variable_identifier {SP}* operator:"**" {SP}* right:variable_identifier\r
+    left:variable_identifier {SP}* math_operator:"**" {SP}* right:variable_identifier\r
     ;\r
 \r
 complex_expression_math2\r

diff --git a/src/jinja2/new_parser.py b/src/jinja2/new_parser.py
index 37bcf77c0cc717aec8725de94ac6c296af41d8d6..b0cba6546660cc238a4e28dac0ecdc52f4af646d 100644 (file)
--- a/src/jinja2/new_parser.py
+++ b/src/jinja2/new_parser.py
@@ -500,6 +500,7 @@ def parse_conditional_expression_math(ast):
         '+': nodes.Add,\r
         '-': nodes.Sub,\r
         '*': nodes.Mul,\r
+        '**': nodes.Pow,\r
         '/': nodes.Div,\r
         '//': nodes.FloorDiv,\r
         '%': nodes.Mod,\r