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

Add expression context parsing

Browse source
This commit is contained in:
Charlie Marsh 2022-08-29 19:47:02 -04:00
parent 02953b9fe6
commit 952d70b9d1
29 changed files with 1024 additions and 581 deletions
Download patch file Download diff file Expand all files Collapse all files

177
parser/src/context.rs Normal file
View file

@ -0,0 +1,177 @@
use rustpython_ast::{Expr, ExprContext, ExprKind};
pub fn set_context(expr: Expr, ctx: ExprContext) -> Expr {
match expr.node {
ExprKind::Name { id, .. } => Expr {
node: ExprKind::Name { id, ctx },
..expr
},
ExprKind::Tuple { elts, .. } => Expr {
node: ExprKind::Tuple {
elts: elts
.into_iter()
.map(|elt| set_context(elt, ctx.clone()))
.collect(),
ctx,
},
..expr
},
ExprKind::List { elts, .. } => Expr {
node: ExprKind::List {
elts: elts
.into_iter()
.map(|elt| set_context(elt, ctx.clone()))
.collect(),
ctx,
},
..expr
},
ExprKind::Attribute { value, attr, .. } => Expr {
node: ExprKind::Attribute { value, attr, ctx },
..expr
},
ExprKind::Subscript { value, slice, .. } => Expr {
node: ExprKind::Subscript { value, slice, ctx },
..expr
},
ExprKind::Starred { value, .. } => Expr {
node: ExprKind::Starred {
value: Box::new(set_context(*value, ctx.clone())),
ctx,
},
..expr
},
_ => expr,
}
}
#[cfg(test)]
mod tests {
use crate::parser::parse_program;
#[test]
fn test_assign_name() {
let source = String::from("x = (1, 2, 3)");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_tuple() {
let source = String::from("(x, y) = (1, 2, 3)");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_list() {
let source = String::from("[x, y] = (1, 2, 3)");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_attribute() {
let source = String::from("x.y = (1, 2, 3)");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_subscript() {
let source = String::from("x[y] = (1, 2, 3)");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_starred() {
let source = String::from("(x, *y) = (1, 2, 3)");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_for() {
let source = String::from("for x in (1, 2, 3): pass");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_list_comp() {
let source = String::from("x = [y for y in (1, 2, 3)]");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_set_comp() {
let source = String::from("x = {y for y in (1, 2, 3)}");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_with() {
let source = String::from("with 1 as x: pass");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_assign_named_expr() {
let source = String::from("if x:= 1: pass");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_ann_assign_name() {
let source = String::from("x: int = 1");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_aug_assign_name() {
let source = String::from("x += 1");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_aug_assign_attribute() {
let source = String::from("x.y += (1, 2, 3)");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_aug_assign_subscript() {
let source = String::from("x[y] += (1, 2, 3)");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_del_name() {
let source = String::from("del x");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_del_attribute() {
let source = String::from("del x.y");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_del_subscript() {
let source = String::from("del x[y]");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
}

1
parser/src/lib.rs
View file

@ -30,5 +30,6 @@ pub mod mode;
pub mod parser;
#[rustfmt::skip]
mod python;
mod context;
mod string;
pub mod token;

48
parser/src/snapshots/rustpython_parser__context__tests__ann_assign_name.snap
View file

@ -4,25 +4,29 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 11,
},
end_location: Some(
Location {
row: 1,
column: 11,
},
),
custom: (),
node: AnnAssign {
target: Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -30,14 +34,16 @@ expression: parse_ast
},
},
annotation: Located {
start: Location {
location: Location {
row: 1,
column: 4,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Name {
id: "int",
@ -46,14 +52,16 @@ expression: parse_ast
},
value: Some(
Located {
start: Location {
location: Location {
row: 1,
column: 10,
},
end: Location {
row: 1,
column: 11,
},
end_location: Some(
Location {
row: 1,
column: 11,
},
),
custom: (),
node: Constant {
value: Int(

42
parser/src/snapshots/rustpython_parser__context__tests__assign.snap Normal file
View file

@ -0,0 +1,42 @@
---
source: compiler/parser/src/context.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 1,
},
custom: (),
node: Assign {
targets: [
Located {
location: Location {
row: 1,
column: 1,
},
custom: (),
node: Name {
id: "x",
ctx: Store,
},
},
],
value: Located {
location: Location {
row: 1,
column: 5,
},
custom: (),
node: Constant {
value: Int(
1,
),
kind: None,
},
},
type_comment: None,
},
},
]

86
parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap
View file

@ -4,37 +4,43 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 16,
},
end_location: Some(
Location {
row: 1,
column: 16,
},
),
custom: (),
node: Assign {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 4,
column: 1,
},
end_location: Some(
Location {
row: 1,
column: 4,
},
),
custom: (),
node: Attribute {
value: Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -47,26 +53,30 @@ expression: parse_ast
},
],
value: Located {
start: Location {
location: Location {
row: 1,
column: 8,
},
end: Location {
row: 1,
column: 15,
},
end_location: Some(
Location {
row: 1,
column: 15,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 8,
},
end: Location {
row: 1,
column: 9,
},
end_location: Some(
Location {
row: 1,
column: 9,
},
),
custom: (),
node: Constant {
value: Int(
@ -76,14 +86,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 12,
},
end_location: Some(
Location {
row: 1,
column: 12,
},
),
custom: (),
node: Constant {
value: Int(
@ -93,14 +105,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 14,
},
end: Location {
row: 1,
column: 15,
},
end_location: Some(
Location {
row: 1,
column: 15,
},
),
custom: (),
node: Constant {
value: Int(

84
parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap
View file

@ -4,25 +4,29 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 25,
},
end_location: Some(
Location {
row: 1,
column: 25,
},
),
custom: (),
node: For {
target: Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Name {
id: "x",
@ -30,26 +34,30 @@ expression: parse_ast
},
},
iter: Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 12,
},
end_location: Some(
Location {
row: 1,
column: 12,
},
),
custom: (),
node: Constant {
value: Int(
@ -59,14 +67,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 14,
},
end: Location {
row: 1,
column: 15,
},
end_location: Some(
Location {
row: 1,
column: 15,
},
),
custom: (),
node: Constant {
value: Int(
@ -76,14 +86,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 17,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: Constant {
value: Int(
@ -98,14 +110,16 @@ expression: parse_ast
},
body: [
Located {
start: Location {
location: Location {
row: 1,
column: 21,
},
end: Location {
row: 1,
column: 25,
},
end_location: Some(
Location {
row: 1,
column: 25,
},
),
custom: (),
node: Pass,
},

96
parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap
View file

@ -4,38 +4,44 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 19,
},
end_location: Some(
Location {
row: 1,
column: 19,
},
),
custom: (),
node: Assign {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: List {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 3,
},
end_location: Some(
Location {
row: 1,
column: 3,
},
),
custom: (),
node: Name {
id: "x",
@ -43,14 +49,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Name {
id: "y",
@ -63,26 +71,30 @@ expression: parse_ast
},
],
value: Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 12,
},
end_location: Some(
Location {
row: 1,
column: 12,
},
),
custom: (),
node: Constant {
value: Int(
@ -92,14 +104,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 14,
},
end: Location {
row: 1,
column: 15,
},
end_location: Some(
Location {
row: 1,
column: 15,
},
),
custom: (),
node: Constant {
value: Int(
@ -109,14 +123,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 17,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: Constant {
value: Int(

108
parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap
View file

@ -4,26 +4,30 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 27,
},
end_location: Some(
Location {
row: 1,
column: 27,
},
),
custom: (),
node: Assign {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -32,25 +36,29 @@ expression: parse_ast
},
],
value: Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 27,
},
end_location: Some(
Location {
row: 1,
column: 27,
},
),
custom: (),
node: ListComp {
elt: Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Name {
id: "y",
@ -60,14 +68,16 @@ expression: parse_ast
generators: [
Comprehension {
target: Located {
start: Location {
location: Location {
row: 1,
column: 12,
},
end: Location {
row: 1,
column: 13,
},
end_location: Some(
Location {
row: 1,
column: 13,
},
),
custom: (),
node: Name {
id: "y",
@ -75,26 +85,30 @@ expression: parse_ast
},
},
iter: Located {
start: Location {
location: Location {
row: 1,
column: 18,
},
end: Location {
row: 1,
column: 25,
},
end_location: Some(
Location {
row: 1,
column: 25,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 18,
},
end: Location {
row: 1,
column: 19,
},
end_location: Some(
Location {
row: 1,
column: 19,
},
),
custom: (),
node: Constant {
value: Int(
@ -104,14 +118,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 21,
},
end: Location {
row: 1,
column: 22,
},
end_location: Some(
Location {
row: 1,
column: 22,
},
),
custom: (),
node: Constant {
value: Int(
@ -121,14 +137,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 24,
},
end: Location {
row: 1,
column: 25,
},
end_location: Some(
Location {
row: 1,
column: 25,
},
),
custom: (),
node: Constant {
value: Int(

72
parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap
View file

@ -4,26 +4,30 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 14,
},
end_location: Some(
Location {
row: 1,
column: 14,
},
),
custom: (),
node: Assign {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -32,26 +36,30 @@ expression: parse_ast
},
],
value: Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 13,
},
end_location: Some(
Location {
row: 1,
column: 13,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Constant {
value: Int(
@ -61,14 +69,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 9,
},
end: Location {
row: 1,
column: 10,
},
end_location: Some(
Location {
row: 1,
column: 10,
},
),
custom: (),
node: Constant {
value: Int(
@ -78,14 +88,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 12,
},
end: Location {
row: 1,
column: 13,
},
end_location: Some(
Location {
row: 1,
column: 13,
},
),
custom: (),
node: Constant {
value: Int(

60
parser/src/snapshots/rustpython_parser__context__tests__assign_named_expr.snap
View file

@ -4,36 +4,42 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 15,
},
end_location: Some(
Location {
row: 1,
column: 15,
},
),
custom: (),
node: If {
test: Located {
start: Location {
location: Location {
row: 1,
column: 4,
},
end: Location {
row: 1,
column: 9,
},
end_location: Some(
Location {
row: 1,
column: 9,
},
),
custom: (),
node: NamedExpr {
target: Located {
start: Location {
location: Location {
row: 1,
column: 4,
},
end: Location {
row: 1,
column: 9,
},
end_location: Some(
Location {
row: 1,
column: 9,
},
),
custom: (),
node: Name {
id: "x",
@ -41,14 +47,16 @@ expression: parse_ast
},
},
value: Located {
start: Location {
location: Location {
row: 1,
column: 8,
},
end: Location {
row: 1,
column: 9,
},
end_location: Some(
Location {
row: 1,
column: 9,
},
),
custom: (),
node: Constant {
value: Int(
@ -61,14 +69,16 @@ expression: parse_ast
},
body: [
Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 15,
},
end_location: Some(
Location {
row: 1,
column: 15,
},
),
custom: (),
node: Pass,
},

108
parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap
View file

@ -4,26 +4,30 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 27,
},
end_location: Some(
Location {
row: 1,
column: 27,
},
),
custom: (),
node: Assign {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -32,25 +36,29 @@ expression: parse_ast
},
],
value: Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 27,
},
end_location: Some(
Location {
row: 1,
column: 27,
},
),
custom: (),
node: SetComp {
elt: Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Name {
id: "y",
@ -60,14 +68,16 @@ expression: parse_ast
generators: [
Comprehension {
target: Located {
start: Location {
location: Location {
row: 1,
column: 12,
},
end: Location {
row: 1,
column: 13,
},
end_location: Some(
Location {
row: 1,
column: 13,
},
),
custom: (),
node: Name {
id: "y",
@ -75,26 +85,30 @@ expression: parse_ast
},
},
iter: Located {
start: Location {
location: Location {
row: 1,
column: 18,
},
end: Location {
row: 1,
column: 25,
},
end_location: Some(
Location {
row: 1,
column: 25,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 18,
},
end: Location {
row: 1,
column: 19,
},
end_location: Some(
Location {
row: 1,
column: 19,
},
),
custom: (),
node: Constant {
value: Int(
@ -104,14 +118,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 21,
},
end: Location {
row: 1,
column: 22,
},
end_location: Some(
Location {
row: 1,
column: 22,
},
),
custom: (),
node: Constant {
value: Int(
@ -121,14 +137,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 24,
},
end: Location {
row: 1,
column: 25,
},
end_location: Some(
Location {
row: 1,
column: 25,
},
),
custom: (),
node: Constant {
value: Int(

108
parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap
View file

@ -4,38 +4,44 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 20,
},
end_location: Some(
Location {
row: 1,
column: 20,
},
),
custom: (),
node: Assign {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 3,
},
end_location: Some(
Location {
row: 1,
column: 3,
},
),
custom: (),
node: Name {
id: "x",
@ -43,25 +49,29 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Starred {
value: Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Name {
id: "y",
@ -77,26 +87,30 @@ expression: parse_ast
},
],
value: Located {
start: Location {
location: Location {
row: 1,
column: 12,
},
end: Location {
row: 1,
column: 19,
},
end_location: Some(
Location {
row: 1,
column: 19,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 12,
},
end: Location {
row: 1,
column: 13,
},
end_location: Some(
Location {
row: 1,
column: 13,
},
),
custom: (),
node: Constant {
value: Int(
@ -106,14 +120,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 15,
},
end: Location {
row: 1,
column: 16,
},
end_location: Some(
Location {
row: 1,
column: 16,
},
),
custom: (),
node: Constant {
value: Int(
@ -123,14 +139,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 18,
},
end: Location {
row: 1,
column: 19,
},
end_location: Some(
Location {
row: 1,
column: 19,
},
),
custom: (),
node: Constant {
value: Int(

98
parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap
View file

@ -4,37 +4,43 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 17,
},
end_location: Some(
Location {
row: 1,
column: 17,
},
),
custom: (),
node: Assign {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 5,
column: 1,
},
end_location: Some(
Location {
row: 1,
column: 5,
},
),
custom: (),
node: Subscript {
value: Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -42,14 +48,16 @@ expression: parse_ast
},
},
slice: Located {
start: Location {
location: Location {
row: 1,
column: 3,
},
end: Location {
row: 1,
column: 4,
},
end_location: Some(
Location {
row: 1,
column: 4,
},
),
custom: (),
node: Name {
id: "y",
@ -61,26 +69,30 @@ expression: parse_ast
},
],
value: Located {
start: Location {
location: Location {
row: 1,
column: 9,
},
end: Location {
row: 1,
column: 16,
},
end_location: Some(
Location {
row: 1,
column: 16,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 9,
},
end: Location {
row: 1,
column: 10,
},
end_location: Some(
Location {
row: 1,
column: 10,
},
),
custom: (),
node: Constant {
value: Int(
@ -90,14 +102,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 12,
},
end: Location {
row: 1,
column: 13,
},
end_location: Some(
Location {
row: 1,
column: 13,
},
),
custom: (),
node: Constant {
value: Int(
@ -107,14 +121,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 15,
},
end: Location {
row: 1,
column: 16,
},
end_location: Some(
Location {
row: 1,
column: 16,
},
),
custom: (),
node: Constant {
value: Int(

96
parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap
View file

@ -4,38 +4,44 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 19,
},
end_location: Some(
Location {
row: 1,
column: 19,
},
),
custom: (),
node: Assign {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 3,
},
end_location: Some(
Location {
row: 1,
column: 3,
},
),
custom: (),
node: Name {
id: "x",
@ -43,14 +49,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Name {
id: "y",
@ -63,26 +71,30 @@ expression: parse_ast
},
],
value: Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 12,
},
end_location: Some(
Location {
row: 1,
column: 12,
},
),
custom: (),
node: Constant {
value: Int(
@ -92,14 +104,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 14,
},
end: Location {
row: 1,
column: 15,
},
end_location: Some(
Location {
row: 1,
column: 15,
},
),
custom: (),
node: Constant {
value: Int(
@ -109,14 +123,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 17,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: Constant {
value: Int(

48
parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap
View file

@ -4,27 +4,31 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: With {
items: [
Withitem {
context_expr: Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Constant {
value: Int(
@ -35,14 +39,16 @@ expression: parse_ast
},
optional_vars: Some(
Located {
start: Location {
location: Location {
row: 1,
column: 11,
},
end: Location {
row: 1,
column: 12,
},
end_location: Some(
Location {
row: 1,
column: 12,
},
),
custom: (),
node: Name {
id: "x",
@ -54,14 +60,16 @@ expression: parse_ast
],
body: [
Located {
start: Location {
location: Location {
row: 1,
column: 14,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: Pass,
},

86
parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap
View file

@ -4,36 +4,42 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 17,
},
end_location: Some(
Location {
row: 1,
column: 17,
},
),
custom: (),
node: AugAssign {
target: Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 4,
column: 1,
},
end_location: Some(
Location {
row: 1,
column: 4,
},
),
custom: (),
node: Attribute {
value: Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -46,26 +52,30 @@ expression: parse_ast
},
op: Add,
value: Located {
start: Location {
location: Location {
row: 1,
column: 9,
},
end: Location {
row: 1,
column: 16,
},
end_location: Some(
Location {
row: 1,
column: 16,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 9,
},
end: Location {
row: 1,
column: 10,
},
end_location: Some(
Location {
row: 1,
column: 10,
},
),
custom: (),
node: Constant {
value: Int(
@ -75,14 +85,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 12,
},
end: Location {
row: 1,
column: 13,
},
end_location: Some(
Location {
row: 1,
column: 13,
},
),
custom: (),
node: Constant {
value: Int(
@ -92,14 +104,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 15,
},
end: Location {
row: 1,
column: 16,
},
end_location: Some(
Location {
row: 1,
column: 16,
},
),
custom: (),
node: Constant {
value: Int(

36
parser/src/snapshots/rustpython_parser__context__tests__aug_assign_name.snap
View file

@ -4,25 +4,29 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: AugAssign {
target: Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -31,14 +35,16 @@ expression: parse_ast
},
op: Add,
value: Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 7,
},
end_location: Some(
Location {
row: 1,
column: 7,
},
),
custom: (),
node: Constant {
value: Int(

98
parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap
View file

@ -4,36 +4,42 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 18,
},
end_location: Some(
Location {
row: 1,
column: 18,
},
),
custom: (),
node: AugAssign {
target: Located {
start: Location {
location: Location {
row: 1,
column: 2,
},
end: Location {
row: 1,
column: 5,
column: 1,
},
end_location: Some(
Location {
row: 1,
column: 5,
},
),
custom: (),
node: Subscript {
value: Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 2,
},
end_location: Some(
Location {
row: 1,
column: 2,
},
),
custom: (),
node: Name {
id: "x",
@ -41,14 +47,16 @@ expression: parse_ast
},
},
slice: Located {
start: Location {
location: Location {
row: 1,
column: 3,
},
end: Location {
row: 1,
column: 4,
},
end_location: Some(
Location {
row: 1,
column: 4,
},
),
custom: (),
node: Name {
id: "y",
@ -60,26 +68,30 @@ expression: parse_ast
},
op: Add,
value: Located {
start: Location {
location: Location {
row: 1,
column: 10,
},
end: Location {
row: 1,
column: 17,
},
end_location: Some(
Location {
row: 1,
column: 17,
},
),
custom: (),
node: Tuple {
elts: [
Located {
start: Location {
location: Location {
row: 1,
column: 10,
},
end: Location {
row: 1,
column: 11,
},
end_location: Some(
Location {
row: 1,
column: 11,
},
),
custom: (),
node: Constant {
value: Int(
@ -89,14 +101,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 13,
},
end: Location {
row: 1,
column: 14,
},
end_location: Some(
Location {
row: 1,
column: 14,
},
),
custom: (),
node: Constant {
value: Int(
@ -106,14 +120,16 @@ expression: parse_ast
},
},
Located {
start: Location {
location: Location {
row: 1,
column: 16,
},
end: Location {
row: 1,
column: 17,
},
end_location: Some(
Location {
row: 1,
column: 17,
},
),
custom: (),
node: Constant {
value: Int(

38
parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap
View file

@ -4,37 +4,43 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 8,
},
end_location: Some(
Location {
row: 1,
column: 8,
},
),
custom: (),
node: Delete {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 8,
column: 5,
},
end_location: Some(
Location {
row: 1,
column: 8,
},
),
custom: (),
node: Attribute {
value: Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Name {
id: "x",

24
parser/src/snapshots/rustpython_parser__context__tests__del_name.snap
View file

@ -4,26 +4,30 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Delete {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Name {
id: "x",

50
parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap
View file

@ -4,37 +4,43 @@ expression: parse_ast
---
[
Located {
start: Location {
location: Location {
row: 1,
column: 1,
},
end: Location {
row: 1,
column: 9,
},
end_location: Some(
Location {
row: 1,
column: 9,
},
),
custom: (),
node: Delete {
targets: [
Located {
start: Location {
location: Location {
row: 1,
column: 6,
},
end: Location {
row: 1,
column: 9,
column: 5,
},
end_location: Some(
Location {
row: 1,
column: 9,
},
),
custom: (),
node: Subscript {
value: Located {
start: Location {
location: Location {
row: 1,
column: 5,
},
end: Location {
row: 1,
column: 6,
},
end_location: Some(
Location {
row: 1,
column: 6,
},
),
custom: (),
node: Name {
id: "x",
@ -42,14 +48,16 @@ expression: parse_ast
},
},
slice: Located {
start: Location {
location: Location {
row: 1,
column: 7,
},
end: Location {
row: 1,
column: 8,
},
end_location: Some(
Location {
row: 1,
column: 8,
},
),
custom: (),
node: Name {
id: "y",

2
parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap
View file

@ -65,7 +65,7 @@ Located {
custom: (),
node: Name {
id: "y",
ctx: Load,
ctx: Store,
},
},
iter: Located {

8
parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap
View file

@ -62,7 +62,7 @@ Located {
custom: (),
node: Name {
id: "y",
ctx: Load,
ctx: Store,
},
},
Located {
@ -79,11 +79,11 @@ Located {
custom: (),
node: Name {
id: "y2",
ctx: Load,
ctx: Store,
},
},
],
ctx: Load,
ctx: Store,
},
},
iter: Located {
@ -121,7 +121,7 @@ Located {
custom: (),
node: Name {
id: "a",
ctx: Load,
ctx: Store,
},
},
iter: Located {

2
parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap
View file

@ -48,7 +48,7 @@ Located {
custom: (),
node: Name {
id: "y",
ctx: Load,
ctx: Store,
},
},
iter: Located {

2
parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap
View file

@ -97,7 +97,7 @@ Located {
custom: (),
node: Name {
id: "y",
ctx: Load,
ctx: Store,
},
},
iter: Located {

2
parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap
View file

@ -48,7 +48,7 @@ Located {
custom: (),
node: Name {
id: "y",
ctx: Load,
ctx: Store,
},
},
iter: Located {

2
parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap
View file

@ -115,7 +115,7 @@ Located {
custom: (),
node: Name {
id: "y",
ctx: Load,
ctx: Store,
},
},
iter: Located {

6
parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap
View file

@ -45,7 +45,7 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name {
id: "a",
ctx: Load,
ctx: Store,
},
},
Located {
@ -62,11 +62,11 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name {
id: "b",
ctx: Load,
ctx: Store,
},
},
],
ctx: Load,
ctx: Store,
},
},
],