Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4340 from harupy/fix-locations-of-parethesized-expressions

Browse Source 
Fix the start and end locations of `Tuple`
This commit is contained in:
Jim Fasarakis-Hilliard
2022-12-18 15:17:40 +02:00
committed by GitHub
parent b4b74a873c 1bebc78cf7
commit c01f014b12
14 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_ast.py vendored
View File

@@ -2107,8 +2107,6 @@ class EndPositionTests(unittest.TestCase):
self._check_content(s, bop.values[1],
'other_condition or yet_another_one')
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_tuples(self):
s1 = 'x = () ;'
s2 = 'x = 1 , ;'
@@ -2190,8 +2188,6 @@ class EndPositionTests(unittest.TestCase):
self._check_content(s, fdef.body[0].value, 'yield x')
self._check_content(s, fdef.body[1].value, 'await y')
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_source_segment_multi(self):
s_orig = dedent('''
x = (

2
compiler/parser/python.lalrpop
View File

@@ -1089,7 +1089,7 @@ AtomAs<Goal>: Goal = {
node: ast::ExprKind::ListComp { elt: Box::new(elt), generators }
}.into()
},
"(" <location:@L> <items:OneOrMore<TestOrStarNamedExprOrWithitem>> <trailing_comma:","?> <end_location:@R> ")" =>? {
<location:@L> "(" <items:OneOrMore<TestOrStarNamedExprOrWithitem>> <trailing_comma:","?> ")" <end_location:@R> =>? {
if items.len() == 1 && items[0].1.is_none() && trailing_comma.is_none() {
match items[0].0.node {
ast::ExprKind::Starred { .. } => {

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap generated
View File

@@ -55,12 +55,12 @@ expression: parse_ast
value: Located {
location: Location {
row: 1,
column: 7,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 14,
column: 15,
},
),
custom: (),

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap generated
View File

@@ -36,12 +36,12 @@ expression: parse_ast
iter: Located {
location: Location {
row: 1,
column: 10,
column: 9,
},
end_location: Some(
Location {
row: 1,
column: 17,
column: 18,
},
),
custom: (),

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap generated
View File

@@ -73,12 +73,12 @@ expression: parse_ast
value: Located {
location: Location {
row: 1,
column: 10,
column: 9,
},
end_location: Some(
Location {
row: 1,
column: 17,
column: 18,
},
),
custom: (),

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap generated
View File

@@ -87,12 +87,12 @@ expression: parse_ast
iter: Located {
location: Location {
row: 1,
column: 17,
column: 16,
},
end_location: Some(
Location {
row: 1,
column: 24,
column: 25,
},
),
custom: (),

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap generated
View File

@@ -38,12 +38,12 @@ expression: parse_ast
value: Located {
location: Location {
row: 1,
column: 5,
column: 4,
},
end_location: Some(
Location {
row: 1,
column: 12,
column: 13,
},
),
custom: (),

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap generated
View File

@@ -87,12 +87,12 @@ expression: parse_ast
iter: Located {
location: Location {
row: 1,
column: 17,
column: 16,
},
end_location: Some(
Location {
row: 1,
column: 24,
column: 25,
},
),
custom: (),

8
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap generated
View File

@@ -20,12 +20,12 @@ expression: parse_ast
Located {
location: Location {
row: 1,
column: 1,
column: 0,
},
end_location: Some(
Location {
row: 1,
column: 6,
column: 7,
},
),
custom: (),
@@ -89,12 +89,12 @@ expression: parse_ast
value: Located {
location: Location {
row: 1,
column: 11,
column: 10,
},
end_location: Some(
Location {
row: 1,
column: 18,
column: 19,
},
),
custom: (),

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap generated
View File

@@ -71,12 +71,12 @@ expression: parse_ast
value: Located {
location: Location {
row: 1,
column: 8,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 15,
column: 16,
},
),
custom: (),

8
compiler/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap generated
View File

@@ -20,12 +20,12 @@ expression: parse_ast
Located {
location: Location {
row: 1,
column: 1,
column: 0,
},
end_location: Some(
Location {
row: 1,
column: 5,
column: 6,
},
),
custom: (),
@@ -73,12 +73,12 @@ expression: parse_ast
value: Located {
location: Location {
row: 1,
column: 10,
column: 9,
},
end_location: Some(
Location {
row: 1,
column: 17,
column: 18,
},
),
custom: (),

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap generated
View File

@@ -54,12 +54,12 @@ expression: parse_ast
value: Located {
location: Location {
row: 1,
column: 8,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 15,
column: 16,
},
),
custom: (),

4
compiler/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap generated
View File

@@ -70,12 +70,12 @@ expression: parse_ast
value: Located {
location: Location {
row: 1,
column: 9,
column: 8,
},
end_location: Some(
Location {
row: 1,
column: 16,
column: 17,
},
),
custom: (),

28
compiler/parser/src/snapshots/rustpython_parser__with__tests__with_statement.snap generated
View File

@@ -891,12 +891,12 @@ expression: "parse_program(source, \"<test>\").unwrap()"
context_expr: Located {
location: Location {
row: 12,
column: 6,
column: 5,
},
end_location: Some(
Location {
row: 12,
column: 8,
column: 9,
},
),
custom: (),
@@ -1061,12 +1061,12 @@ expression: "parse_program(source, \"<test>\").unwrap()"
context_expr: Located {
location: Location {
row: 14,
column: 6,
column: 5,
},
end_location: Some(
Location {
row: 14,
column: 10,
column: 11,
},
),
custom: (),
@@ -1172,12 +1172,12 @@ expression: "parse_program(source, \"<test>\").unwrap()"
context_expr: Located {
location: Location {
row: 15,
column: 6,
column: 5,
},
end_location: Some(
Location {
row: 15,
column: 9,
column: 10,
},
),
custom: (),
@@ -1260,12 +1260,12 @@ expression: "parse_program(source, \"<test>\").unwrap()"
context_expr: Located {
location: Location {
row: 16,
column: 6,
column: 5,
},
end_location: Some(
Location {
row: 16,
column: 9,
column: 10,
},
),
custom: (),
@@ -1366,12 +1366,12 @@ expression: "parse_program(source, \"<test>\").unwrap()"
context_expr: Located {
location: Location {
row: 17,
column: 6,
column: 5,
},
end_location: Some(
Location {
row: 17,
column: 11,
column: 12,
},
),
custom: (),
@@ -1473,12 +1473,12 @@ expression: "parse_program(source, \"<test>\").unwrap()"
context_expr: Located {
location: Location {
row: 18,
column: 6,
column: 5,
},
end_location: Some(
Location {
row: 18,
column: 11,
column: 12,
},
),
custom: (),
@@ -1934,12 +1934,12 @@ expression: "parse_program(source, \"<test>\").unwrap()"
context_expr: Located {
location: Location {
row: 22,
column: 6,
column: 5,
},
end_location: Some(
Location {
row: 22,
column: 20,
column: 21,
},
),
custom: (),