mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-09 22:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow starred expressions in subscripts

Browse source
This commit is contained in:
Charlie Marsh 2023-02-20 17:59:35 -05:00
parent 72ddb53d0f
commit 4c559a9a51
3 changed files with 654 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
parser/python.lalrpop
View file

@ -1037,7 +1037,7 @@ SubscriptList: ast::Expr = {
}; };
Subscript: ast::Expr = { Subscript: ast::Expr = {
NamedExpressionTest, TestOrStarNamedExpr,
<location:@L> <e1:Test<"all">?> ":" <e2:Test<"all">?> <e3:SliceOp?> <end_location:@R> => { <location:@L> <e1:Test<"all">?> ":" <e2:Test<"all">?> <e3:SliceOp?> <end_location:@R> => {
let lower = e1.map(Box::new); let lower = e1.map(Box::new);
let upper = e2.map(Box::new); let upper = e2.map(Box::new);

12
parser/src/parser.rs
View file

@ -392,6 +392,18 @@ with (0 as a, 1 as b,): pass
} }
} }
#[test]
fn test_star_index() {
let source = "\
array_slice = array[0, *idxs, -1]
array[0, *idxs, -1] = array_slice
array[*idxs_to_select, *idxs_to_select]
array[3:5, *idxs_to_select]
";
let parse_ast = parse_program(source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test] #[test]
fn test_generator_expression_argument() { fn test_generator_expression_argument() {
let source = r#"' '.join( let source = r#"' '.join(

641
parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap Normal file
View file

@ -0,0 +1,641 @@
---
source: compiler/parser/src/parser.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 0,
},
end_location: Some(
Location {
row: 1,
column: 33,
},
),
custom: (),
node: Assign {
targets: [
Located {
location: Location {
row: 1,
column: 0,
},
end_location: Some(
Location {
row: 1,
column: 11,
},
),
custom: (),
node: Name {
id: "array_slice",
ctx: Store,
},
},
],
value: Located {
location: Location {
row: 1,
column: 14,
},
end_location: Some(
Location {
row: 1,
column: 33,
},
),
custom: (),
node: Subscript {
value: Located {
location: Location {
row: 1,
column: 14,
},
end_location: Some(
Location {
row: 1,
column: 19,
},
),
custom: (),
node: Name {
id: "array",
ctx: Load,
},
},
slice: Located {
location: Location {
row: 1,
column: 20,
},
end_location: Some(
Location {
row: 1,
column: 32,
},
),
custom: (),
node: Tuple {
elts: [
Located {
location: Location {
row: 1,
column: 20,
},
end_location: Some(
Location {
row: 1,
column: 21,
},
),
custom: (),
node: Constant {
value: Int(
0,
),
kind: None,
},
},
Located {
location: Location {
row: 1,
column: 23,
},
end_location: Some(
Location {
row: 1,
column: 28,
},
),
custom: (),
node: Starred {
value: Located {
location: Location {
row: 1,
column: 24,
},
end_location: Some(
Location {
row: 1,
column: 28,
},
),
custom: (),
node: Name {
id: "idxs",
ctx: Load,
},
},
ctx: Load,
},
},
Located {
location: Location {
row: 1,
column: 30,
},
end_location: Some(
Location {
row: 1,
column: 32,
},
),
custom: (),
node: UnaryOp {
op: USub,
operand: Located {
location: Location {
row: 1,
column: 31,
},
end_location: Some(
Location {
row: 1,
column: 32,
},
),
custom: (),
node: Constant {
value: Int(
1,
),
kind: None,
},
},
},
},
],
ctx: Load,
},
},
ctx: Load,
},
},
type_comment: None,
},
},
Located {
location: Location {
row: 2,
column: 0,
},
end_location: Some(
Location {
row: 2,
column: 33,
},
),
custom: (),
node: Assign {
targets: [
Located {
location: Location {
row: 2,
column: 0,
},
end_location: Some(
Location {
row: 2,
column: 19,
},
),
custom: (),
node: Subscript {
value: Located {
location: Location {
row: 2,
column: 0,
},
end_location: Some(
Location {
row: 2,
column: 5,
},
),
custom: (),
node: Name {
id: "array",
ctx: Load,
},
},
slice: Located {
location: Location {
row: 2,
column: 6,
},
end_location: Some(
Location {
row: 2,
column: 18,
},
),
custom: (),
node: Tuple {
elts: [
Located {
location: Location {
row: 2,
column: 6,
},
end_location: Some(
Location {
row: 2,
column: 7,
},
),
custom: (),
node: Constant {
value: Int(
0,
),
kind: None,
},
},
Located {
location: Location {
row: 2,
column: 9,
},
end_location: Some(
Location {
row: 2,
column: 14,
},
),
custom: (),
node: Starred {
value: Located {
location: Location {
row: 2,
column: 10,
},
end_location: Some(
Location {
row: 2,
column: 14,
},
),
custom: (),
node: Name {
id: "idxs",
ctx: Load,
},
},
ctx: Load,
},
},
Located {
location: Location {
row: 2,
column: 16,
},
end_location: Some(
Location {
row: 2,
column: 18,
},
),
custom: (),
node: UnaryOp {
op: USub,
operand: Located {
location: Location {
row: 2,
column: 17,
},
end_location: Some(
Location {
row: 2,
column: 18,
},
),
custom: (),
node: Constant {
value: Int(
1,
),
kind: None,
},
},
},
},
],
ctx: Load,
},
},
ctx: Store,
},
},
],
value: Located {
location: Location {
row: 2,
column: 22,
},
end_location: Some(
Location {
row: 2,
column: 33,
},
),
custom: (),
node: Name {
id: "array_slice",
ctx: Load,
},
},
type_comment: None,
},
},
Located {
location: Location {
row: 3,
column: 0,
},
end_location: Some(
Location {
row: 3,
column: 39,
},
),
custom: (),
node: Expr {
value: Located {
location: Location {
row: 3,
column: 0,
},
end_location: Some(
Location {
row: 3,
column: 39,
},
),
custom: (),
node: Subscript {
value: Located {
location: Location {
row: 3,
column: 0,
},
end_location: Some(
Location {
row: 3,
column: 5,
},
),
custom: (),
node: Name {
id: "array",
ctx: Load,
},
},
slice: Located {
location: Location {
row: 3,
column: 6,
},
end_location: Some(
Location {
row: 3,
column: 38,
},
),
custom: (),
node: Tuple {
elts: [
Located {
location: Location {
row: 3,
column: 6,
},
end_location: Some(
Location {
row: 3,
column: 21,
},
),
custom: (),
node: Starred {
value: Located {
location: Location {
row: 3,
column: 7,
},
end_location: Some(
Location {
row: 3,
column: 21,
},
),
custom: (),
node: Name {
id: "idxs_to_select",
ctx: Load,
},
},
ctx: Load,
},
},
Located {
location: Location {
row: 3,
column: 23,
},
end_location: Some(
Location {
row: 3,
column: 38,
},
),
custom: (),
node: Starred {
value: Located {
location: Location {
row: 3,
column: 24,
},
end_location: Some(
Location {
row: 3,
column: 38,
},
),
custom: (),
node: Name {
id: "idxs_to_select",
ctx: Load,
},
},
ctx: Load,
},
},
],
ctx: Load,
},
},
ctx: Load,
},
},
},
},
Located {
location: Location {
row: 4,
column: 0,
},
end_location: Some(
Location {
row: 4,
column: 27,
},
),
custom: (),
node: Expr {
value: Located {
location: Location {
row: 4,
column: 0,
},
end_location: Some(
Location {
row: 4,
column: 27,
},
),
custom: (),
node: Subscript {
value: Located {
location: Location {
row: 4,
column: 0,
},
end_location: Some(
Location {
row: 4,
column: 5,
},
),
custom: (),
node: Name {
id: "array",
ctx: Load,
},
},
slice: Located {
location: Location {
row: 4,
column: 6,
},
end_location: Some(
Location {
row: 4,
column: 26,
},
),
custom: (),
node: Tuple {
elts: [
Located {
location: Location {
row: 4,
column: 6,
},
end_location: Some(
Location {
row: 4,
column: 9,
},
),
custom: (),
node: Slice {
lower: Some(
Located {
location: Location {
row: 4,
column: 6,
},
end_location: Some(
Location {
row: 4,
column: 7,
},
),
custom: (),
node: Constant {
value: Int(
3,
),
kind: None,
},
},
),
upper: Some(
Located {
location: Location {
row: 4,
column: 8,
},
end_location: Some(
Location {
row: 4,
column: 9,
},
),
custom: (),
node: Constant {
value: Int(
5,
),
kind: None,
},
},
),
step: None,
},
},
Located {
location: Location {
row: 4,
column: 11,
},
end_location: Some(
Location {
row: 4,
column: 26,
},
),
custom: (),
node: Starred {
value: Located {
location: Location {
row: 4,
column: 12,
},
end_location: Some(
Location {
row: 4,
column: 26,
},
),
custom: (),
node: Name {
id: "idxs_to_select",
ctx: Load,
},
},
ctx: Load,
},
},
],
ctx: Load,
},
},
ctx: Load,
},
},
},
},
]