Merge pull request RustPython#4306 from harupy/fix-boolop-location

Fix `ExprKind::BoolOp` location

Author: DimitrisJim

Lib/test/test_ast.py

@@ -2100,8 +2100,6 @@ def test_binop(self):
         self._check_content(s, binop.left, '1 * 2 + (3 )')
         self._check_content(s, binop.left.right, '3')
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_boolop(self):
         s = dedent('''
             if (one_condition and

compiler/parser/python.lalrpop

@@ -756,7 +756,7 @@ LambdaDef: ast::Expr = {
 }
 
 OrTest: ast::Expr = {
-    <e1:AndTest> <location:@L> <e2:("or" AndTest)*> <end_location:@R> => {
+    <location:@L> <e1:AndTest> <e2:("or" AndTest)*> <end_location:@R> => {
         if e2.is_empty() {
             e1
         } else {
@@ -773,7 +773,7 @@ OrTest: ast::Expr = {
 };
 
 AndTest: ast::Expr = {
-    <e1:NotTest> <location:@L> <e2:("and" NotTest)*> <end_location:@R> => {
+    <location:@L> <e1:NotTest> <e2:("and" NotTest)*> <end_location:@R> => {
         if e2.is_empty() {
             e1
         } else {

compiler/parser/src/parser.rs

@@ -218,4 +218,18 @@ class Foo(A, B):
         let parse_ast = parse_expression(&source, "<test>").unwrap();
         insta::assert_debug_snapshot!(parse_ast);
     }
+
+    #[test]
+    fn test_parse_boolop_or() {
+        let source = String::from("x or y");
+        let parse_ast = parse_expression(&source, "<test>").unwrap();
+        insta::assert_debug_snapshot!(parse_ast);
+    }
+
+    #[test]
+    fn test_parse_boolop_and() {
+        let source = String::from("x and y");
+        let parse_ast = parse_expression(&source, "<test>").unwrap();
+        insta::assert_debug_snapshot!(parse_ast);
+    }
 }