From: Kevin Brown <kevin@kevin-brown.com>
Date: Fri, 15 May 2020 00:04:02 +0000 (-0400)
Subject: Fix parsing of the ** operator
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5d018fdef9db1e2a4fd554fd35b08b53a35abc3;p=thirdparty%2Fjinja.git

Fix parsing of the ** operator
---

diff --git a/grammar.ebnf b/grammar.ebnf
index 2d1406a3..8620f994 100644
--- a/grammar.ebnf
+++ b/grammar.ebnf
@@ -254,7 +254,7 @@ conditional_expression
 
 complex_expression_powers
     =
-    left:variable_identifier {SP}* operator:"**" {SP}* right:variable_identifier
+    left:variable_identifier {SP}* math_operator:"**" {SP}* right:variable_identifier
     ;
 
 complex_expression_math2
diff --git a/src/jinja2/new_parser.py b/src/jinja2/new_parser.py
index 37bcf77c..b0cba654 100644
--- a/src/jinja2/new_parser.py
+++ b/src/jinja2/new_parser.py
@@ -500,6 +500,7 @@ def parse_conditional_expression_math(ast):
         '+': nodes.Add,
         '-': nodes.Sub,
         '*': nodes.Mul,
+        '**': nodes.Pow,
         '/': nodes.Div,
         '//': nodes.FloorDiv,
         '%': nodes.Mod,