tweak operator precedence

BCG-X-Official · Dec 4, 2020 · 7b18a22 · 7b18a22
1 parent 877af1b
commit 7b18a22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/pytools/expression/operator/_operator.py b/src/pytools/expression/operator/_operator.py
@@ -199,9 +199,9 @@ def is_unary(self) -> bool:
 UnaryOperator.LAMBDA = UnaryOperator("lambda")
 
 __OPERATOR_PRECEDENCE_ORDER: Tuple[Set[Operator], ...] = (
-    {BinaryOperator.COMMA},
-    {BinaryOperator.ASSIGN, BinaryOperator.COLON, BinaryOperator.SLICE},
-    {UnaryOperator.LAMBDA},
+    {BinaryOperator.ASSIGN},
+    {BinaryOperator.COMMA, UnaryOperator.LAMBDA},
+    {BinaryOperator.COLON, BinaryOperator.SLICE},
     {BinaryOperator.OR},
     {BinaryOperator.AND},
     {UnaryOperator.NOT},

diff --git a/test/test/pytools/test_expression.py b/test/test/pytools/test_expression.py
@@ -87,8 +87,14 @@ def test_expression_formatting() -> None:
 )"""
     )
 
-    expr_4 = Lambda(Id.x, body=e)(Lit(5))
-    assert repr(expr_4) == "(lambda x: f((1 | 2) >> 'x' % x, abc=-5))(5)"
+    expr_4 = Lambda(body=e)
+    assert repr(expr_4) == "lambda : f((1 | 2) >> 'x' % x, abc=-5)"
+
+    expr_5 = Lambda(Id.x, body=e)(Lit(5))
+    assert repr(expr_5) == "(lambda x: f((1 | 2) >> 'x' % x, abc=-5))(5)"
+
+    expr_6 = Lambda(Id.x, Id.y, body=e)(Lit(5), 6)
+    assert repr(expr_6) == "(lambda x, y: f((1 | 2) >> 'x' % x, abc=-5))(5, 6)"
 
 
 def test_expression() -> None: