mirrors/RustPython
0
0 Fork 0
mirror of https://github.com/RustPython/RustPython.git synced 2026-10-29 03:04:38 +08:00
Code Activity

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

Browse Source 
Fix `ExprKind::BoolOp` location
This commit is contained in:
Jim Fasarakis-Hilliard authored and GitHub committed 2022-12-05 02:41:19 +02:00
2 parents 39bed0df51 18293dc80c
commit 28f9f65ccc
5 files changed
+128 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Lib/test/test_ast.py
Vendored
-2
View File
@@ -2100,8 +2100,6 @@ class EndPositionTests(unittest.TestCase):
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
+2 -2
View File
@@ -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
+14
View File
@@ -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);
}
}
compiler/parser/src/snapshots/rustpython_parser__parser__tests__parse_boolop_and.snap
Generated
+56
View File
@@ -0,0 +1,56 @@
---
source: compiler/parser/src/parser.rs
expression: parse_ast
---
Located {
location: Location {
row: 1,
column: 0,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: BoolOp {
op: And,
values: [
Located {
location: Location {
row: 1,
column: 0,
},
end_location: Some(
Location {
row: 1,
column: 1,
},
),
custom: (),
node: Name {
id: "x",
ctx: Load,
},
},
Located {
location: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Name {
id: "y",
ctx: Load,
},
},
],
},
}
compiler/parser/src/snapshots/rustpython_parser__parser__tests__parse_boolop_or.snap
Generated
+56
View File
@@ -0,0 +1,56 @@
---
source: compiler/parser/src/parser.rs
expression: parse_ast
---
Located {
location: Location {
row: 1,
column: 0,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: BoolOp {
op: Or,
values: [
Located {
location: Location {
row: 1,
column: 0,
},
end_location: Some(
Location {
row: 1,
column: 1,
},
),
custom: (),
node: Name {
id: "x",
ctx: Load,
},
},
Located {
location: Location {
row: 1,
column: 5,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Name {
id: "y",
ctx: Load,
},
},
],
},
}