From cd89c0efc3ca804ffac65a007cf6564a8dd1b413 Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Sun, 14 May 2023 17:10:21 +0200 Subject: [PATCH] Update tests --- ...rser__context__tests__ann_assign_name.snap | 8 +- ...ser__context__tests__assign_attribute.snap | 14 +- ...on_parser__context__tests__assign_for.snap | 12 +- ...n_parser__context__tests__assign_list.snap | 16 +- ...ser__context__tests__assign_list_comp.snap | 18 +- ...n_parser__context__tests__assign_name.snap | 12 +- ...er__context__tests__assign_named_expr.snap | 8 +- ...rser__context__tests__assign_set_comp.snap | 18 +- ...arser__context__tests__assign_starred.snap | 18 +- ...ser__context__tests__assign_subscript.snap | 16 +- ..._parser__context__tests__assign_tuple.snap | 16 +- ...n_parser__context__tests__assign_with.snap | 6 +- ..._context__tests__aug_assign_attribute.snap | 14 +- ...rser__context__tests__aug_assign_name.snap | 6 +- ..._context__tests__aug_assign_subscript.snap | 16 +- ...parser__context__tests__del_attribute.snap | 6 +- ...thon_parser__context__tests__del_name.snap | 4 +- ...parser__context__tests__del_subscript.snap | 8 +- ...unction__tests__function_kw_only_args.snap | 2 +- ...__function_kw_only_args_with_defaults.snap | 6 +- ...er__function__tests__function_no_args.snap | 2 +- ..._tests__function_pos_and_kw_only_args.snap | 2 +- ...on_pos_and_kw_only_args_with_defaults.snap | 6 +- ...w_only_args_with_defaults_and_varargs.snap | 6 +- ..._with_defaults_and_varargs_and_kwargs.snap | 6 +- ...r__function__tests__function_pos_args.snap | 2 +- ...ests__function_pos_args_with_defaults.snap | 6 +- ..._function__tests__lambda_kw_only_args.snap | 6 +- ...ts__lambda_kw_only_args_with_defaults.snap | 10 +- ...rser__function__tests__lambda_no_args.snap | 6 +- ...n__tests__lambda_pos_and_kw_only_args.snap | 6 +- ...ser__function__tests__lambda_pos_args.snap | 6 +- ..._tests__lambda_pos_args_with_defaults.snap | 10 +- ...parser__parser__tests__dict_unpacking.snap | 12 +- ..._tests__generator_expression_argument.snap | 38 +- ...stpython_parser__parser__tests__match.snap | 246 ++-- ...r__parser__tests__match_as_identifier.snap | 460 ++++---- ...ser__parser__tests__parse_bool_op_and.snap | 6 +- ...rser__parser__tests__parse_bool_op_or.snap | 6 +- ...on_parser__parser__tests__parse_class.snap | 12 +- ...rser__tests__parse_dict_comprehension.snap | 10 +- ...ests__parse_double_list_comprehension.snap | 28 +- ...parser__parser__tests__parse_f_string.snap | 6 +- ..._tests__parse_generator_comprehension.snap | 8 +- ...er__parser__tests__parse_if_elif_else.snap | 20 +- ...parse_if_else_generator_comprehension.snap | 14 +- ...n_parser__parser__tests__parse_kwargs.snap | 10 +- ...n_parser__parser__tests__parse_lambda.snap | 10 +- ...rser__tests__parse_list_comprehension.snap | 8 +- ...ed_expression_generator_comprehension.snap | 16 +- ..._parser__parser__tests__parse_print_2.snap | 10 +- ...ser__parser__tests__parse_print_hello.snap | 8 +- ...n_parser__parser__tests__parse_string.snap | 4 +- ...n_parser__parser__tests__parse_tuples.snap | 14 +- ...stpython_parser__parser__tests__patma.snap | 1028 ++++++++--------- ...stpython_parser__parser__tests__slice.snap | 12 +- ...hon_parser__parser__tests__star_index.snap | 74 +- ...rustpython_parser__parser__tests__try.snap | 54 +- ...ython_parser__parser__tests__try_star.snap | 96 +- ...ser__parser__tests__variadic_generics.snap | 18 +- ...parser__parser__tests__with_statement.snap | 220 ++-- ...arser__string__tests__backspace_alias.snap | 4 +- ...hon_parser__string__tests__bell_alias.snap | 4 +- ..._string__tests__carriage_return_alias.snap | 4 +- ...r_tabulation_with_justification_alias.snap | 4 +- ...n_parser__string__tests__delete_alias.snap | 4 +- ...er__string__tests__double_quoted_byte.snap | 4 +- ...n_parser__string__tests__escape_alias.snap | 4 +- ...g__tests__escape_char_in_byte_literal.snap | 4 +- ...n_parser__string__tests__escape_octet.snap | 4 +- ...arser__string__tests__form_feed_alias.snap | 4 +- ...ing__tests__fstring_escaped_character.snap | 10 +- ...tring__tests__fstring_escaped_newline.snap | 10 +- ...ing__tests__fstring_line_continuation.snap | 10 +- ...__fstring_parse_self_documenting_base.snap | 8 +- ...ring_parse_self_documenting_base_more.snap | 20 +- ...fstring_parse_self_documenting_format.snap | 12 +- ...ing__tests__fstring_unescaped_newline.snap | 10 +- ...thon_parser__string__tests__hts_alias.snap | 4 +- ...tring__tests__parse_f_string_concat_1.snap | 6 +- ...tring__tests__parse_f_string_concat_2.snap | 6 +- ...tring__tests__parse_f_string_concat_3.snap | 10 +- ..._parser__string__tests__parse_fstring.snap | 10 +- ...__string__tests__parse_fstring_equals.snap | 8 +- ...ing__tests__parse_fstring_nested_spec.snap | 10 +- ...ring__tests__parse_fstring_not_equals.snap | 8 +- ..._tests__parse_fstring_not_nested_spec.snap | 8 +- ...ts__parse_fstring_self_doc_prec_space.snap | 8 +- ...parse_fstring_self_doc_trailing_space.snap | 8 +- ...ring__tests__parse_fstring_yield_expr.snap | 4 +- ...r__string__tests__parse_string_concat.snap | 4 +- ..._parse_string_triple_quotes_with_kind.snap | 4 +- ...ing__tests__parse_u_f_string_concat_1.snap | 6 +- ...ing__tests__parse_u_f_string_concat_2.snap | 6 +- ...tring__tests__parse_u_string_concat_1.snap | 4 +- ...tring__tests__parse_u_string_concat_2.snap | 4 +- ...er__string__tests__raw_byte_literal_1.snap | 4 +- ...er__string__tests__raw_byte_literal_2.snap | 4 +- ...on_parser__string__tests__raw_fstring.snap | 8 +- ...er__string__tests__single_quoted_byte.snap | 4 +- ...ing__tests__triple_quoted_raw_fstring.snap | 8 +- 101 files changed, 1506 insertions(+), 1506 deletions(-) diff --git a/parser/src/snapshots/rustpython_parser__context__tests__ann_assign_name.snap b/parser/src/snapshots/rustpython_parser__context__tests__ann_assign_name.snap index bea9f37..9ef7e7d 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__ann_assign_name.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__ann_assign_name.snap @@ -5,37 +5,37 @@ expression: parse_ast [ AnnAssign( StmtAnnAssign { + range: 0..10, target: Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Store, - range: 0..1, }, ), annotation: Name( ExprName { + range: 3..6, id: Identifier( "int", ), ctx: Load, - range: 3..6, }, ), value: Some( Constant( ExprConstant { + range: 9..10, value: Int( 1, ), kind: None, - range: 9..10, }, ), ), simple: true, - range: 0..10, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap index 42479a5..51d45cf 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap @@ -5,63 +5,63 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..15, targets: [ Attribute( ExprAttribute { + range: 0..3, value: Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Load, - range: 0..1, }, ), attr: Identifier( "y", ), ctx: Store, - range: 0..3, }, ), ], value: Tuple( ExprTuple { + range: 6..15, elts: [ Constant( ExprConstant { + range: 7..8, value: Int( 1, ), kind: None, - range: 7..8, }, ), Constant( ExprConstant { + range: 10..11, value: Int( 2, ), kind: None, - range: 10..11, }, ), Constant( ExprConstant { + range: 13..14, value: Int( 3, ), kind: None, - range: 13..14, }, ), ], ctx: Load, - range: 6..15, }, ), type_comment: None, - range: 0..15, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap index 0cb5f6f..26c7e5a 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap @@ -5,48 +5,49 @@ expression: parse_ast [ For( StmtFor { + range: 0..24, target: Name( ExprName { + range: 4..5, id: Identifier( "x", ), ctx: Store, - range: 4..5, }, ), iter: Tuple( ExprTuple { + range: 9..18, elts: [ Constant( ExprConstant { + range: 10..11, value: Int( 1, ), kind: None, - range: 10..11, }, ), Constant( ExprConstant { + range: 13..14, value: Int( 2, ), kind: None, - range: 13..14, }, ), Constant( ExprConstant { + range: 16..17, value: Int( 3, ), kind: None, - range: 16..17, }, ), ], ctx: Load, - range: 9..18, }, ), body: [ @@ -58,7 +59,6 @@ expression: parse_ast ], orelse: [], type_comment: None, - range: 0..24, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap index 55e736e..df42127 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap @@ -5,71 +5,71 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..18, targets: [ List( ExprList { + range: 0..6, elts: [ Name( ExprName { + range: 1..2, id: Identifier( "x", ), ctx: Store, - range: 1..2, }, ), Name( ExprName { + range: 4..5, id: Identifier( "y", ), ctx: Store, - range: 4..5, }, ), ], ctx: Store, - range: 0..6, }, ), ], value: Tuple( ExprTuple { + range: 9..18, elts: [ Constant( ExprConstant { + range: 10..11, value: Int( 1, ), kind: None, - range: 10..11, }, ), Constant( ExprConstant { + range: 13..14, value: Int( 2, ), kind: None, - range: 13..14, }, ), Constant( ExprConstant { + range: 16..17, value: Int( 3, ), kind: None, - range: 16..17, }, ), ], ctx: Load, - range: 9..18, }, ), type_comment: None, - range: 0..18, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap index 4a231c1..5dd7c86 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap @@ -5,72 +5,74 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..26, targets: [ Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Store, - range: 0..1, }, ), ], value: ListComp( ExprListComp { + range: 4..26, elt: Name( ExprName { + range: 5..6, id: Identifier( "y", ), ctx: Load, - range: 5..6, }, ), generators: [ Comprehension { target: Name( ExprName { + range: 11..12, id: Identifier( "y", ), ctx: Store, - range: 11..12, }, ), iter: Tuple( ExprTuple { + range: 16..25, elts: [ Constant( ExprConstant { + range: 17..18, value: Int( 1, ), kind: None, - range: 17..18, }, ), Constant( ExprConstant { + range: 20..21, value: Int( 2, ), kind: None, - range: 20..21, }, ), Constant( ExprConstant { + range: 23..24, value: Int( 3, ), kind: None, - range: 23..24, }, ), ], ctx: Load, - range: 16..25, }, ), ifs: [], @@ -78,11 +80,9 @@ expression: parse_ast range: (), }, ], - range: 4..26, }, ), type_comment: None, - range: 0..26, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap index 8531e15..d947f5e 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap @@ -5,54 +5,54 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..13, targets: [ Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Store, - range: 0..1, }, ), ], value: Tuple( ExprTuple { + range: 4..13, elts: [ Constant( ExprConstant { + range: 5..6, value: Int( 1, ), kind: None, - range: 5..6, }, ), Constant( ExprConstant { + range: 8..9, value: Int( 2, ), kind: None, - range: 8..9, }, ), Constant( ExprConstant { + range: 11..12, value: Int( 3, ), kind: None, - range: 11..12, }, ), ], ctx: Load, - range: 4..13, }, ), type_comment: None, - range: 0..13, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_named_expr.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_named_expr.snap index 9adcc6f..46bdb5a 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_named_expr.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_named_expr.snap @@ -5,27 +5,28 @@ expression: parse_ast [ If( StmtIf { + range: 0..14, test: NamedExpr( ExprNamedExpr { + range: 3..8, target: Name( ExprName { + range: 3..4, id: Identifier( "x", ), ctx: Store, - range: 3..4, }, ), value: Constant( ExprConstant { + range: 7..8, value: Int( 1, ), kind: None, - range: 7..8, }, ), - range: 3..8, }, ), body: [ @@ -36,7 +37,6 @@ expression: parse_ast ), ], orelse: [], - range: 0..14, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap index da113cd..7affc47 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap @@ -5,72 +5,74 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..26, targets: [ Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Store, - range: 0..1, }, ), ], value: SetComp( ExprSetComp { + range: 4..26, elt: Name( ExprName { + range: 5..6, id: Identifier( "y", ), ctx: Load, - range: 5..6, }, ), generators: [ Comprehension { target: Name( ExprName { + range: 11..12, id: Identifier( "y", ), ctx: Store, - range: 11..12, }, ), iter: Tuple( ExprTuple { + range: 16..25, elts: [ Constant( ExprConstant { + range: 17..18, value: Int( 1, ), kind: None, - range: 17..18, }, ), Constant( ExprConstant { + range: 20..21, value: Int( 2, ), kind: None, - range: 20..21, }, ), Constant( ExprConstant { + range: 23..24, value: Int( 3, ), kind: None, - range: 23..24, }, ), ], ctx: Load, - range: 16..25, }, ), ifs: [], @@ -78,11 +80,9 @@ expression: parse_ast range: (), }, ], - range: 4..26, }, ), type_comment: None, - range: 0..26, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap index 64ed94e..7d589a2 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap @@ -5,77 +5,77 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..19, targets: [ Tuple( ExprTuple { + range: 0..7, elts: [ Name( ExprName { + range: 1..2, id: Identifier( "x", ), ctx: Store, - range: 1..2, }, ), Starred( ExprStarred { + range: 4..6, value: Name( ExprName { + range: 5..6, id: Identifier( "y", ), ctx: Store, - range: 5..6, }, ), ctx: Store, - range: 4..6, }, ), ], ctx: Store, - range: 0..7, }, ), ], value: Tuple( ExprTuple { + range: 10..19, elts: [ Constant( ExprConstant { + range: 11..12, value: Int( 1, ), kind: None, - range: 11..12, }, ), Constant( ExprConstant { + range: 14..15, value: Int( 2, ), kind: None, - range: 14..15, }, ), Constant( ExprConstant { + range: 17..18, value: Int( 3, ), kind: None, - range: 17..18, }, ), ], ctx: Load, - range: 10..19, }, ), type_comment: None, - range: 0..19, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap index 22c321a..520c44c 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap @@ -5,69 +5,69 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..16, targets: [ Subscript( ExprSubscript { + range: 0..4, value: Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Load, - range: 0..1, }, ), slice: Name( ExprName { + range: 2..3, id: Identifier( "y", ), ctx: Load, - range: 2..3, }, ), ctx: Store, - range: 0..4, }, ), ], value: Tuple( ExprTuple { + range: 7..16, elts: [ Constant( ExprConstant { + range: 8..9, value: Int( 1, ), kind: None, - range: 8..9, }, ), Constant( ExprConstant { + range: 11..12, value: Int( 2, ), kind: None, - range: 11..12, }, ), Constant( ExprConstant { + range: 14..15, value: Int( 3, ), kind: None, - range: 14..15, }, ), ], ctx: Load, - range: 7..16, }, ), type_comment: None, - range: 0..16, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap index 7974668..ca889e9 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap @@ -5,71 +5,71 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..18, targets: [ Tuple( ExprTuple { + range: 0..6, elts: [ Name( ExprName { + range: 1..2, id: Identifier( "x", ), ctx: Store, - range: 1..2, }, ), Name( ExprName { + range: 4..5, id: Identifier( "y", ), ctx: Store, - range: 4..5, }, ), ], ctx: Store, - range: 0..6, }, ), ], value: Tuple( ExprTuple { + range: 9..18, elts: [ Constant( ExprConstant { + range: 10..11, value: Int( 1, ), kind: None, - range: 10..11, }, ), Constant( ExprConstant { + range: 13..14, value: Int( 2, ), kind: None, - range: 13..14, }, ), Constant( ExprConstant { + range: 16..17, value: Int( 3, ), kind: None, - range: 16..17, }, ), ], ctx: Load, - range: 9..18, }, ), type_comment: None, - range: 0..18, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap index a5435c3..b9f9334 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap @@ -5,25 +5,26 @@ expression: parse_ast [ With( StmtWith { + range: 0..17, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 5..6, value: Int( 1, ), kind: None, - range: 5..6, }, ), optional_vars: Some( Name( ExprName { + range: 10..11, id: Identifier( "x", ), ctx: Store, - range: 10..11, }, ), ), @@ -38,7 +39,6 @@ expression: parse_ast ), ], type_comment: None, - range: 0..17, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap index c416da0..8250db5 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap @@ -5,61 +5,61 @@ expression: parse_ast [ AugAssign( StmtAugAssign { + range: 0..16, target: Attribute( ExprAttribute { + range: 0..3, value: Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Load, - range: 0..1, }, ), attr: Identifier( "y", ), ctx: Store, - range: 0..3, }, ), op: Add, value: Tuple( ExprTuple { + range: 7..16, elts: [ Constant( ExprConstant { + range: 8..9, value: Int( 1, ), kind: None, - range: 8..9, }, ), Constant( ExprConstant { + range: 11..12, value: Int( 2, ), kind: None, - range: 11..12, }, ), Constant( ExprConstant { + range: 14..15, value: Int( 3, ), kind: None, - range: 14..15, }, ), ], ctx: Load, - range: 7..16, }, ), - range: 0..16, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_name.snap b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_name.snap index 5731d2b..42e9ed8 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_name.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_name.snap @@ -5,26 +5,26 @@ expression: parse_ast [ AugAssign( StmtAugAssign { + range: 0..6, target: Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Store, - range: 0..1, }, ), op: Add, value: Constant( ExprConstant { + range: 5..6, value: Int( 1, ), kind: None, - range: 5..6, }, ), - range: 0..6, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap index 8a8b86d..476b9c9 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap @@ -5,67 +5,67 @@ expression: parse_ast [ AugAssign( StmtAugAssign { + range: 0..17, target: Subscript( ExprSubscript { + range: 0..4, value: Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Load, - range: 0..1, }, ), slice: Name( ExprName { + range: 2..3, id: Identifier( "y", ), ctx: Load, - range: 2..3, }, ), ctx: Store, - range: 0..4, }, ), op: Add, value: Tuple( ExprTuple { + range: 8..17, elts: [ Constant( ExprConstant { + range: 9..10, value: Int( 1, ), kind: None, - range: 9..10, }, ), Constant( ExprConstant { + range: 12..13, value: Int( 2, ), kind: None, - range: 12..13, }, ), Constant( ExprConstant { + range: 15..16, value: Int( 3, ), kind: None, - range: 15..16, }, ), ], ctx: Load, - range: 8..17, }, ), - range: 0..17, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap b/parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap index 8709f06..1de7d6b 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap @@ -5,27 +5,27 @@ expression: parse_ast [ Delete( StmtDelete { + range: 0..7, targets: [ Attribute( ExprAttribute { + range: 4..7, value: Name( ExprName { + range: 4..5, id: Identifier( "x", ), ctx: Load, - range: 4..5, }, ), attr: Identifier( "y", ), ctx: Del, - range: 4..7, }, ), ], - range: 0..7, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__del_name.snap b/parser/src/snapshots/rustpython_parser__context__tests__del_name.snap index 6c8301a..d87ac27 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__del_name.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__del_name.snap @@ -5,18 +5,18 @@ expression: parse_ast [ Delete( StmtDelete { + range: 0..5, targets: [ Name( ExprName { + range: 4..5, id: Identifier( "x", ), ctx: Del, - range: 4..5, }, ), ], - range: 0..5, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap b/parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap index 359bfbe..067401c 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap @@ -5,33 +5,33 @@ expression: parse_ast [ Delete( StmtDelete { + range: 0..8, targets: [ Subscript( ExprSubscript { + range: 4..8, value: Name( ExprName { + range: 4..5, id: Identifier( "x", ), ctx: Load, - range: 4..5, }, ), slice: Name( ExprName { + range: 6..7, id: Identifier( "y", ), ctx: Load, - range: 6..7, }, ), ctx: Del, - range: 4..8, }, ), ], - range: 0..8, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap index ea11dac..b034e5b 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..23, name: Identifier( "f", ), @@ -54,7 +55,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..23, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap index b6c8480..b372b44 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..29, name: Identifier( "f", ), @@ -42,20 +43,20 @@ Ok( kw_defaults: [ Constant( ExprConstant { + range: 14..16, value: Int( 20, ), kind: None, - range: 14..16, }, ), Constant( ExprConstant { + range: 20..22, value: Int( 30, ), kind: None, - range: 20..22, }, ), ], @@ -73,7 +74,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..29, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_no_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_no_args.snap index e5bf372..1b418a6 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_no_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_no_args.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..13, name: Identifier( "f", ), @@ -29,7 +30,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..13, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap index 3323bb9..88f1c75 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..32, name: Identifier( "f", ), @@ -79,7 +80,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..32, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap index 719376d..98e9ea7 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..38, name: Identifier( "f", ), @@ -67,20 +68,20 @@ Ok( kw_defaults: [ Constant( ExprConstant { + range: 23..25, value: Int( 20, ), kind: None, - range: 23..25, }, ), Constant( ExprConstant { + range: 29..31, value: Int( 30, ), kind: None, - range: 29..31, }, ), ], @@ -98,7 +99,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..38, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap index 9a5478c..180ed18 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..42, name: Identifier( "f", ), @@ -76,20 +77,20 @@ Ok( kw_defaults: [ Constant( ExprConstant { + range: 27..29, value: Int( 20, ), kind: None, - range: 27..29, }, ), Constant( ExprConstant { + range: 33..35, value: Int( 30, ), kind: None, - range: 33..35, }, ), ], @@ -107,7 +108,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..42, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap index 238682f..7693451 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..52, name: Identifier( "f", ), @@ -76,20 +77,20 @@ Ok( kw_defaults: [ Constant( ExprConstant { + range: 27..29, value: Int( 20, ), kind: None, - range: 27..29, }, ), Constant( ExprConstant { + range: 33..35, value: Int( 30, ), kind: None, - range: 33..35, }, ), ], @@ -116,7 +117,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..52, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap index 4fc4e73..7d36cd2 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..20, name: Identifier( "f", ), @@ -54,7 +55,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..20, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap index bcc3d9f..ee87569 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap @@ -6,6 +6,7 @@ Ok( [ FunctionDef( StmtFunctionDef { + range: 0..26, name: Identifier( "f", ), @@ -44,20 +45,20 @@ Ok( defaults: [ Constant( ExprConstant { + range: 11..13, value: Int( 20, ), kind: None, - range: 11..13, }, ), Constant( ExprConstant { + range: 17..19, value: Int( 30, ), kind: None, - range: 17..19, }, ), ], @@ -73,7 +74,6 @@ Ok( decorator_list: [], returns: None, type_comment: None, - range: 0..26, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args.snap index 0cec1f8..5f11e33 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args.snap @@ -6,8 +6,10 @@ Ok( [ Expr( StmtExpr { + range: 0..20, value: Lambda( ExprLambda { + range: 0..20, args: Arguments { posonlyargs: [], args: [], @@ -45,17 +47,15 @@ Ok( }, body: Constant( ExprConstant { + range: 19..20, value: Int( 1, ), kind: None, - range: 19..20, }, ), - range: 0..20, }, ), - range: 0..20, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args_with_defaults.snap index 7a67d59..3bc17f4 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args_with_defaults.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args_with_defaults.snap @@ -6,8 +6,10 @@ Ok( [ Expr( StmtExpr { + range: 0..26, value: Lambda( ExprLambda { + range: 0..26, args: Arguments { posonlyargs: [], args: [], @@ -41,20 +43,20 @@ Ok( kw_defaults: [ Constant( ExprConstant { + range: 15..17, value: Int( 20, ), kind: None, - range: 15..17, }, ), Constant( ExprConstant { + range: 21..23, value: Int( 30, ), kind: None, - range: 21..23, }, ), ], @@ -64,17 +66,15 @@ Ok( }, body: Constant( ExprConstant { + range: 25..26, value: Int( 1, ), kind: None, - range: 25..26, }, ), - range: 0..26, }, ), - range: 0..26, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__lambda_no_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__lambda_no_args.snap index 43d4b5b..3670b4a 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__lambda_no_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__lambda_no_args.snap @@ -6,8 +6,10 @@ Ok( [ Expr( StmtExpr { + range: 0..9, value: Lambda( ExprLambda { + range: 0..9, args: Arguments { posonlyargs: [], args: [], @@ -20,17 +22,15 @@ Ok( }, body: Constant( ExprConstant { + range: 8..9, value: Int( 1, ), kind: None, - range: 8..9, }, ), - range: 0..9, }, ), - range: 0..9, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_and_kw_only_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_and_kw_only_args.snap index a0d4a3d..93f2fb4 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_and_kw_only_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_and_kw_only_args.snap @@ -6,8 +6,10 @@ Ok( [ Expr( StmtExpr { + range: 0..26, value: Lambda( ExprLambda { + range: 0..26, args: Arguments { posonlyargs: [], args: [ @@ -62,17 +64,15 @@ Ok( }, body: Constant( ExprConstant { + range: 25..26, value: Int( 0, ), kind: None, - range: 25..26, }, ), - range: 0..26, }, ), - range: 0..26, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args.snap index 8c42e87..39fcaaa 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args.snap @@ -6,8 +6,10 @@ Ok( [ Expr( StmtExpr { + range: 0..17, value: Lambda( ExprLambda { + range: 0..17, args: Arguments { posonlyargs: [], args: [ @@ -45,17 +47,15 @@ Ok( }, body: Constant( ExprConstant { + range: 16..17, value: Int( 1, ), kind: None, - range: 16..17, }, ), - range: 0..17, }, ), - range: 0..17, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args_with_defaults.snap index 5d63e73..ee28116 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args_with_defaults.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args_with_defaults.snap @@ -6,8 +6,10 @@ Ok( [ Expr( StmtExpr { + range: 0..23, value: Lambda( ExprLambda { + range: 0..23, args: Arguments { posonlyargs: [], args: [ @@ -43,20 +45,20 @@ Ok( defaults: [ Constant( ExprConstant { + range: 12..14, value: Int( 20, ), kind: None, - range: 12..14, }, ), Constant( ExprConstant { + range: 18..20, value: Int( 30, ), kind: None, - range: 18..20, }, ), ], @@ -64,17 +66,15 @@ Ok( }, body: Constant( ExprConstant { + range: 22..23, value: Int( 1, ), kind: None, - range: 22..23, }, ), - range: 0..23, }, ), - range: 0..23, }, ), ], diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__dict_unpacking.snap b/parser/src/snapshots/rustpython_parser__parser__tests__dict_unpacking.snap index f124217..bfe8674 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__dict_unpacking.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__dict_unpacking.snap @@ -4,15 +4,16 @@ expression: parse_ast --- Dict( ExprDict { + range: 0..25, keys: [ Some( Constant( ExprConstant { + range: 1..4, value: Str( "a", ), kind: None, - range: 1..4, }, ), ), @@ -20,11 +21,11 @@ Dict( Some( Constant( ExprConstant { + range: 16..19, value: Str( "d", ), kind: None, - range: 16..19, }, ), ), @@ -32,32 +33,31 @@ Dict( values: [ Constant( ExprConstant { + range: 6..9, value: Str( "b", ), kind: None, - range: 6..9, }, ), Name( ExprName { + range: 13..14, id: Identifier( "c", ), ctx: Load, - range: 13..14, }, ), Constant( ExprConstant { + range: 21..24, value: Str( "e", ), kind: None, - range: 21..24, }, ), ], - range: 0..25, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__generator_expression_argument.snap b/parser/src/snapshots/rustpython_parser__parser__tests__generator_expression_argument.snap index 4d8c774..814cb86 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__generator_expression_argument.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__generator_expression_argument.snap @@ -4,143 +4,145 @@ expression: parse_ast --- Call( ExprCall { + range: 0..141, func: Attribute( ExprAttribute { + range: 0..8, value: Constant( ExprConstant { + range: 0..3, value: Str( " ", ), kind: None, - range: 0..3, }, ), attr: Identifier( "join", ), ctx: Load, - range: 0..8, }, ), args: [ GeneratorExp( ExprGeneratorExp { + range: 14..139, elt: Name( ExprName { + range: 14..17, id: Identifier( "sql", ), ctx: Load, - range: 14..17, }, ), generators: [ Comprehension { target: Name( ExprName { + range: 26..29, id: Identifier( "sql", ), ctx: Store, - range: 26..29, }, ), iter: Tuple( ExprTuple { + range: 33..139, elts: [ IfExp( ExprIfExp { + range: 43..80, test: Name( ExprName { + range: 65..70, id: Identifier( "limit", ), ctx: Load, - range: 65..70, }, ), body: BinOp( ExprBinOp { + range: 43..61, left: Constant( ExprConstant { + range: 43..53, value: Str( "LIMIT %d", ), kind: None, - range: 43..53, }, ), op: Mod, right: Name( ExprName { + range: 56..61, id: Identifier( "limit", ), ctx: Load, - range: 56..61, }, ), - range: 43..61, }, ), orelse: Constant( ExprConstant { + range: 76..80, value: None, kind: None, - range: 76..80, }, ), - range: 43..80, }, ), IfExp( ExprIfExp { + range: 90..132, test: Name( ExprName { + range: 116..122, id: Identifier( "offset", ), ctx: Load, - range: 116..122, }, ), body: BinOp( ExprBinOp { + range: 91..111, left: Constant( ExprConstant { + range: 91..102, value: Str( "OFFSET %d", ), kind: None, - range: 91..102, }, ), op: Mod, right: Name( ExprName { + range: 105..111, id: Identifier( "offset", ), ctx: Load, - range: 105..111, }, ), - range: 91..111, }, ), orelse: Constant( ExprConstant { + range: 128..132, value: None, kind: None, - range: 128..132, }, ), - range: 90..132, }, ), ], ctx: Load, - range: 33..139, }, ), ifs: [], @@ -148,11 +150,9 @@ Call( range: (), }, ], - range: 14..139, }, ), ], keywords: [], - range: 0..141, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__match.snap b/parser/src/snapshots/rustpython_parser__parser__tests__match.snap index dddc3b0..2a87e75 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__match.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__match.snap @@ -5,17 +5,19 @@ expression: parse_ast [ Match( StmtMatch { + range: 1..73, subject: Dict( ExprDict { + range: 7..18, keys: [ Some( Constant( ExprConstant { + range: 8..14, value: Str( "test", ), kind: None, - range: 8..14, }, ), ), @@ -23,21 +25,21 @@ expression: parse_ast values: [ Constant( ExprConstant { + range: 16..17, value: Int( 1, ), kind: None, - range: 16..17, }, ), ], - range: 7..18, }, ), cases: [ MatchCase { pattern: MatchMapping( PatternMatchMapping { + range: 29..52, keys: [], patterns: [], rest: Some( @@ -45,62 +47,62 @@ expression: parse_ast "rest", ), ), - range: 29..52, }, ), guard: None, body: [ Expr( StmtExpr { + range: 62..73, value: Call( ExprCall { + range: 62..73, func: Name( ExprName { + range: 62..67, id: Identifier( "print", ), ctx: Load, - range: 62..67, }, ), args: [ Name( ExprName { + range: 68..72, id: Identifier( "rest", ), ctx: Load, - range: 68..72, }, ), ], keywords: [], - range: 62..73, }, ), - range: 62..73, }, ), ], range: (), }, ], - range: 1..73, }, ), Match( StmtMatch { + range: 74..177, subject: Dict( ExprDict { + range: 80..97, keys: [ Some( Constant( ExprConstant { + range: 81..88, value: Str( "label", ), kind: None, - range: 81..88, }, ), ), @@ -108,64 +110,65 @@ expression: parse_ast values: [ Constant( ExprConstant { + range: 90..96, value: Str( "test", ), kind: None, - range: 90..96, }, ), ], - range: 80..97, }, ), cases: [ MatchCase { pattern: MatchMapping( PatternMatchMapping { + range: 108..155, keys: [ Constant( ExprConstant { + range: 118..125, value: Str( "label", ), kind: None, - range: 118..125, }, ), ], patterns: [ MatchAs( PatternMatchAs { + range: 127..148, pattern: Some( MatchOr( PatternMatchOr { + range: 127..139, patterns: [ MatchClass( PatternMatchClass { + range: 127..132, cls: Name( ExprName { + range: 127..130, id: Identifier( "str", ), ctx: Load, - range: 127..130, }, ), patterns: [], kwd_attrs: [], kwd_patterns: [], - range: 127..132, }, ), MatchSingleton( PatternMatchSingleton { - value: None, range: 135..139, + value: None, }, ), ], - range: 127..139, }, ), ), @@ -174,287 +177,284 @@ expression: parse_ast "label", ), ), - range: 127..148, }, ), ], rest: None, - range: 108..155, }, ), guard: None, body: [ Expr( StmtExpr { + range: 165..177, value: Call( ExprCall { + range: 165..177, func: Name( ExprName { + range: 165..170, id: Identifier( "print", ), ctx: Load, - range: 165..170, }, ), args: [ Name( ExprName { + range: 171..176, id: Identifier( "label", ), ctx: Load, - range: 171..176, }, ), ], keywords: [], - range: 165..177, }, ), - range: 165..177, }, ), ], range: (), }, ], - range: 74..177, }, ), Match( StmtMatch { - subject: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 184..185, - }, - ), - cases: [ - MatchCase { - pattern: MatchSequence( - PatternMatchSequence { - patterns: [ - MatchValue( - PatternMatchValue { - value: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 197..198, - }, - ), - range: 197..198, - }, - ), - MatchValue( - PatternMatchValue { - value: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 200..201, - }, - ), - range: 200..201, - }, - ), - ], - range: 196..203, - }, - ), - guard: None, - body: [ - Assign( - StmtAssign { - targets: [ - Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 213..214, - }, - ), - ], - value: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 217..218, - }, - ), - type_comment: None, - range: 213..218, - }, - ), - ], - range: (), - }, - ], range: 178..218, - }, - ), - Match( - StmtMatch { subject: Name( ExprName { + range: 184..185, id: Identifier( "x", ), ctx: Load, - range: 225..226, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 196..203, patterns: [ MatchValue( PatternMatchValue { + range: 197..198, value: Constant( ExprConstant { + range: 197..198, value: Int( 0, ), kind: None, - range: 238..239, }, ), - range: 238..239, }, ), MatchValue( PatternMatchValue { + range: 200..201, value: Constant( ExprConstant { + range: 200..201, value: Int( 1, ), kind: None, - range: 241..242, }, ), - range: 241..242, }, ), ], - range: 237..244, }, ), guard: None, body: [ Assign( StmtAssign { + range: 213..218, targets: [ Name( ExprName { + range: 213..214, id: Identifier( "y", ), ctx: Store, - range: 254..255, }, ), ], value: Constant( ExprConstant { + range: 217..218, value: Int( 0, ), kind: None, - range: 258..259, }, ), type_comment: None, - range: 254..259, }, ), ], range: (), }, ], - range: 219..259, }, ), Match( StmtMatch { + range: 219..259, subject: Name( ExprName { + range: 225..226, id: Identifier( "x", ), ctx: Load, - range: 266..267, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 237..244, patterns: [ MatchValue( PatternMatchValue { + range: 238..239, value: Constant( ExprConstant { + range: 238..239, value: Int( 0, ), kind: None, - range: 279..280, }, ), - range: 279..280, + }, + ), + MatchValue( + PatternMatchValue { + range: 241..242, + value: Constant( + ExprConstant { + range: 241..242, + value: Int( + 1, + ), + kind: None, + }, + ), }, ), ], - range: 278..282, }, ), guard: None, body: [ Assign( StmtAssign { + range: 254..259, targets: [ Name( ExprName { + range: 254..255, id: Identifier( "y", ), ctx: Store, - range: 292..293, }, ), ], value: Constant( ExprConstant { + range: 258..259, value: Int( 0, ), kind: None, - range: 296..297, }, ), type_comment: None, - range: 292..297, }, ), ], range: (), }, ], + }, + ), + Match( + StmtMatch { range: 260..297, + subject: Name( + ExprName { + range: 266..267, + id: Identifier( + "x", + ), + ctx: Load, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + range: 278..282, + patterns: [ + MatchValue( + PatternMatchValue { + range: 279..280, + value: Constant( + ExprConstant { + range: 279..280, + value: Int( + 0, + ), + kind: None, + }, + ), + }, + ), + ], + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + range: 292..297, + targets: [ + Name( + ExprName { + range: 292..293, + id: Identifier( + "y", + ), + ctx: Store, + }, + ), + ], + value: Constant( + ExprConstant { + range: 296..297, + value: Int( + 0, + ), + kind: None, + }, + ), + type_comment: None, + }, + ), + ], + range: (), + }, + ], }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__match_as_identifier.snap b/parser/src/snapshots/rustpython_parser__parser__tests__match_as_identifier.snap index c929565..46bfa21 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__match_as_identifier.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__match_as_identifier.snap @@ -5,686 +5,687 @@ expression: parse_ast [ Expr( StmtExpr { + range: 1..16, value: Tuple( ExprTuple { + range: 1..16, elts: [ BinOp( ExprBinOp { + range: 1..13, left: BinOp( ExprBinOp { + range: 1..9, left: Name( ExprName { + range: 1..6, id: Identifier( "match", ), ctx: Load, - range: 1..6, }, ), op: Mult, right: Name( ExprName { + range: 8..9, id: Identifier( "a", ), ctx: Load, - range: 8..9, }, ), - range: 1..9, }, ), op: Add, right: Name( ExprName { + range: 12..13, id: Identifier( "b", ), ctx: Load, - range: 12..13, }, ), - range: 1..13, }, ), Name( ExprName { + range: 15..16, id: Identifier( "c", ), ctx: Load, - range: 15..16, }, ), ], ctx: Load, - range: 1..16, }, ), - range: 1..16, }, ), Expr( StmtExpr { + range: 42..59, value: Tuple( ExprTuple { + range: 42..59, elts: [ BinOp( ExprBinOp { + range: 42..56, left: Name( ExprName { + range: 42..47, id: Identifier( "match", ), ctx: Load, - range: 42..47, }, ), op: Mult, right: BinOp( ExprBinOp { + range: 50..55, left: Name( ExprName { + range: 50..51, id: Identifier( "a", ), ctx: Load, - range: 50..51, }, ), op: Add, right: Name( ExprName { + range: 54..55, id: Identifier( "b", ), ctx: Load, - range: 54..55, }, ), - range: 50..55, }, ), - range: 42..56, }, ), Name( ExprName { + range: 58..59, id: Identifier( "c", ), ctx: Load, - range: 58..59, }, ), ], ctx: Load, - range: 42..59, }, ), - range: 42..59, }, ), Expr( StmtExpr { + range: 85..102, value: Call( ExprCall { + range: 85..102, func: Name( ExprName { + range: 85..90, id: Identifier( "match", ), ctx: Load, - range: 85..90, }, ), args: [ Starred( ExprStarred { + range: 92..98, value: BinOp( ExprBinOp { + range: 93..98, left: Name( ExprName { + range: 93..94, id: Identifier( "a", ), ctx: Load, - range: 93..94, }, ), op: Add, right: Name( ExprName { + range: 97..98, id: Identifier( "b", ), ctx: Load, - range: 97..98, }, ), - range: 93..98, }, ), ctx: Load, - range: 92..98, }, ), Name( ExprName { + range: 100..101, id: Identifier( "c", ), ctx: Load, - range: 100..101, }, ), ], keywords: [], - range: 85..102, }, ), - range: 85..102, }, ), Expr( StmtExpr { - value: BinOp( - ExprBinOp { - left: BinOp( - ExprBinOp { - left: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 129..134, - }, - ), - op: Sub, - right: BinOp( - ExprBinOp { - left: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 136..137, - }, - ), - op: Mult, - right: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 140..141, - }, - ), - range: 136..141, - }, - ), - range: 129..141, - }, - ), - op: Add, - right: Name( - ExprName { - id: Identifier( - "c", - ), - ctx: Load, - range: 144..145, - }, - ), - range: 129..145, - }, - ), range: 129..145, - }, - ), - Expr( - StmtExpr { value: BinOp( ExprBinOp { + range: 129..145, left: BinOp( ExprBinOp { + range: 129..141, left: Name( ExprName { + range: 129..134, id: Identifier( "match", ), ctx: Load, - range: 172..177, }, ), op: Sub, right: BinOp( ExprBinOp { + range: 136..141, left: Name( ExprName { + range: 136..137, id: Identifier( "a", ), ctx: Load, - range: 180..181, }, ), op: Mult, right: Name( ExprName { + range: 140..141, id: Identifier( "b", ), ctx: Load, - range: 184..185, }, ), - range: 180..185, }, ), - range: 172..186, }, ), op: Add, right: Name( ExprName { + range: 144..145, id: Identifier( "c", ), ctx: Load, - range: 189..190, }, ), - range: 172..190, }, ), - range: 172..190, }, ), Expr( StmtExpr { + range: 172..190, value: BinOp( ExprBinOp { + range: 172..190, left: BinOp( ExprBinOp { + range: 172..186, + left: Name( + ExprName { + range: 172..177, + id: Identifier( + "match", + ), + ctx: Load, + }, + ), + op: Sub, + right: BinOp( + ExprBinOp { + range: 180..185, + left: Name( + ExprName { + range: 180..181, + id: Identifier( + "a", + ), + ctx: Load, + }, + ), + op: Mult, + right: Name( + ExprName { + range: 184..185, + id: Identifier( + "b", + ), + ctx: Load, + }, + ), + }, + ), + }, + ), + op: Add, + right: Name( + ExprName { + range: 189..190, + id: Identifier( + "c", + ), + ctx: Load, + }, + ), + }, + ), + }, + ), + Expr( + StmtExpr { + range: 217..235, + value: BinOp( + ExprBinOp { + range: 217..235, + left: BinOp( + ExprBinOp { + range: 217..231, left: Call( ExprCall { + range: 217..227, func: Name( ExprName { + range: 217..222, id: Identifier( "match", ), ctx: Load, - range: 217..222, }, ), args: [ UnaryOp( ExprUnaryOp { + range: 224..226, op: USub, operand: Name( ExprName { + range: 225..226, id: Identifier( "a", ), ctx: Load, - range: 225..226, }, ), - range: 224..226, }, ), ], keywords: [], - range: 217..227, }, ), op: Mult, right: Name( ExprName { + range: 230..231, id: Identifier( "b", ), ctx: Load, - range: 230..231, }, ), - range: 217..231, }, ), op: Add, right: Name( ExprName { + range: 234..235, id: Identifier( "c", ), ctx: Load, - range: 234..235, }, ), - range: 217..235, }, ), - range: 217..235, }, ), Expr( StmtExpr { + range: 263..273, value: Attribute( ExprAttribute { + range: 263..273, value: Call( ExprCall { + range: 263..271, func: Name( ExprName { + range: 263..268, id: Identifier( "match", ), ctx: Load, - range: 263..268, }, ), args: [], keywords: [], - range: 263..271, }, ), attr: Identifier( "a", ), ctx: Load, - range: 263..273, }, ), - range: 263..273, }, ), Expr( StmtExpr { - value: Attribute( - ExprAttribute { - value: Call( - ExprCall { - func: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 290..295, - }, - ), - args: [ - Tuple( - ExprTuple { - elts: [], - ctx: Load, - range: 297..299, - }, - ), - ], - keywords: [], - range: 290..300, - }, - ), - attr: Identifier( - "a", - ), - ctx: Load, - range: 290..302, - }, - ), range: 290..302, - }, - ), - Expr( - StmtExpr { value: Attribute( ExprAttribute { + range: 290..302, value: Call( ExprCall { + range: 290..300, func: Name( ExprName { + range: 290..295, id: Identifier( "match", ), ctx: Load, - range: 321..326, }, ), args: [ Tuple( ExprTuple { + range: 297..299, elts: [], ctx: Load, - range: 328..330, }, ), ], keywords: [], - range: 321..332, }, ), attr: Identifier( "a", ), ctx: Load, - range: 321..334, }, ), - range: 321..334, }, ), Expr( StmtExpr { + range: 321..334, value: Attribute( ExprAttribute { + range: 321..334, + value: Call( + ExprCall { + range: 321..332, + func: Name( + ExprName { + range: 321..326, + id: Identifier( + "match", + ), + ctx: Load, + }, + ), + args: [ + Tuple( + ExprTuple { + range: 328..330, + elts: [], + ctx: Load, + }, + ), + ], + keywords: [], + }, + ), + attr: Identifier( + "a", + ), + ctx: Load, + }, + ), + }, + ), + Expr( + StmtExpr { + range: 353..364, + value: Attribute( + ExprAttribute { + range: 353..364, value: Subscript( ExprSubscript { + range: 353..362, value: Name( ExprName { + range: 353..358, id: Identifier( "match", ), ctx: Load, - range: 353..358, }, ), slice: Name( ExprName { + range: 360..361, id: Identifier( "a", ), ctx: Load, - range: 360..361, }, ), ctx: Load, - range: 353..362, }, ), attr: Identifier( "b", ), ctx: Load, - range: 353..364, }, ), - range: 353..364, }, ), Expr( StmtExpr { - value: Attribute( - ExprAttribute { - value: Subscript( - ExprSubscript { - value: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 382..387, - }, - ), - slice: Tuple( - ExprTuple { - elts: [ - Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 389..390, - }, - ), - ], - ctx: Load, - range: 389..391, - }, - ), - ctx: Load, - range: 382..392, - }, - ), - attr: Identifier( - "b", - ), - ctx: Load, - range: 382..394, - }, - ), range: 382..394, - }, - ), - Expr( - StmtExpr { value: Attribute( ExprAttribute { + range: 382..394, value: Subscript( ExprSubscript { + range: 382..392, value: Name( ExprName { + range: 382..387, id: Identifier( "match", ), ctx: Load, - range: 435..440, }, ), slice: Tuple( ExprTuple { + range: 389..391, elts: [ Name( ExprName { + range: 389..390, id: Identifier( "a", ), ctx: Load, - range: 443..444, }, ), ], ctx: Load, - range: 442..446, }, ), ctx: Load, - range: 435..447, }, ), attr: Identifier( "b", ), ctx: Load, - range: 435..449, }, ), - range: 435..449, }, ), Expr( StmtExpr { + range: 435..449, + value: Attribute( + ExprAttribute { + range: 435..449, + value: Subscript( + ExprSubscript { + range: 435..447, + value: Name( + ExprName { + range: 435..440, + id: Identifier( + "match", + ), + ctx: Load, + }, + ), + slice: Tuple( + ExprTuple { + range: 442..446, + elts: [ + Name( + ExprName { + range: 443..444, + id: Identifier( + "a", + ), + ctx: Load, + }, + ), + ], + ctx: Load, + }, + ), + ctx: Load, + }, + ), + attr: Identifier( + "b", + ), + ctx: Load, + }, + ), + }, + ), + Expr( + StmtExpr { + range: 470..487, value: Subscript( ExprSubscript { + range: 470..487, value: Call( ExprCall { + range: 470..477, func: Name( ExprName { + range: 470..475, id: Identifier( "match", ), ctx: Load, - range: 470..475, }, ), args: [], keywords: [], - range: 470..477, }, ), slice: Slice( ExprSlice { + range: 478..486, lower: Some( Name( ExprName { + range: 478..479, id: Identifier( "a", ), ctx: Load, - range: 478..479, }, ), ), upper: Some( Name( ExprName { + range: 485..486, id: Identifier( "b", ), ctx: Load, - range: 485..486, }, ), ), step: None, - range: 478..486, }, ), ctx: Load, - range: 470..487, }, ), - range: 470..487, }, ), If( StmtIf { + range: 507..526, test: NamedExpr( ExprNamedExpr { + range: 510..520, target: Name( ExprName { + range: 510..515, id: Identifier( "match", ), ctx: Store, - range: 510..515, }, ), value: Constant( ExprConstant { + range: 519..520, value: Int( 1, ), kind: None, - range: 519..520, }, ), - range: 510..520, }, ), body: [ @@ -695,34 +696,34 @@ expression: parse_ast ), ], orelse: [], - range: 507..526, }, ), Match( StmtMatch { + range: 527..581, subject: Name( ExprName { + range: 533..538, id: Identifier( "match", ), ctx: Load, - range: 533..538, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 549..550, value: Constant( ExprConstant { + range: 549..550, value: Int( 1, ), kind: None, - range: 549..550, }, ), - range: 549..550, }, ), guard: None, @@ -738,16 +739,16 @@ expression: parse_ast MatchCase { pattern: MatchValue( PatternMatchValue { + range: 566..567, value: Constant( ExprConstant { + range: 566..567, value: Int( 2, ), kind: None, - range: 566..567, }, ), - range: 566..567, }, ), guard: None, @@ -761,24 +762,25 @@ expression: parse_ast range: (), }, ], - range: 527..581, }, ), Assign( StmtAssign { + range: 582..618, targets: [ Name( ExprName { + range: 582..587, id: Identifier( "match", ), ctx: Store, - range: 582..587, }, ), ], value: Lambda( ExprLambda { + range: 590..618, args: Arguments { posonlyargs: [], args: [ @@ -800,13 +802,14 @@ expression: parse_ast }, body: Compare( ExprCompare { + range: 604..618, left: Name( ExprName { + range: 604..609, id: Identifier( "query", ), ctx: Load, - range: 604..609, }, ), ops: [ @@ -815,70 +818,67 @@ expression: parse_ast comparators: [ Name( ExprName { + range: 613..618, id: Identifier( "event", ), ctx: Load, - range: 613..618, }, ), ], - range: 604..618, }, ), - range: 590..618, }, ), type_comment: None, - range: 582..618, }, ), Expr( StmtExpr { + range: 619..635, value: Call( ExprCall { + range: 619..635, func: Name( ExprName { + range: 619..624, id: Identifier( "print", ), ctx: Load, - range: 619..624, }, ), args: [ Call( ExprCall { + range: 625..634, func: Name( ExprName { + range: 625..630, id: Identifier( "match", ), ctx: Load, - range: 625..630, }, ), args: [ Constant( ExprConstant { + range: 631..633, value: Int( 12, ), kind: None, - range: 631..633, }, ), ], keywords: [], - range: 625..634, }, ), ], keywords: [], - range: 619..635, }, ), - range: 619..635, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_and.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_and.snap index 353dff5..aba6bff 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_and.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_and.snap @@ -4,27 +4,27 @@ expression: parse_ast --- BoolOp( ExprBoolOp { + range: 0..7, op: And, values: [ Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Load, - range: 0..1, }, ), Name( ExprName { + range: 6..7, id: Identifier( "y", ), ctx: Load, - range: 6..7, }, ), ], - range: 0..7, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_or.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_or.snap index fede6f1..c7f31ca 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_or.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_or.snap @@ -4,27 +4,27 @@ expression: parse_ast --- BoolOp( ExprBoolOp { + range: 0..6, op: Or, values: [ Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Load, - range: 0..1, }, ), Name( ExprName { + range: 5..6, id: Identifier( "y", ), ctx: Load, - range: 5..6, }, ), ], - range: 0..6, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap index e043e5d..3b25478 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap @@ -5,26 +5,27 @@ expression: "parse_program(source, \"\").unwrap()" [ ClassDef( StmtClassDef { + range: 0..98, name: Identifier( "Foo", ), bases: [ Name( ExprName { + range: 10..11, id: Identifier( "A", ), ctx: Load, - range: 10..11, }, ), Name( ExprName { + range: 13..14, id: Identifier( "B", ), ctx: Load, - range: 13..14, }, ), ], @@ -32,6 +33,7 @@ expression: "parse_program(source, \"\").unwrap()" body: [ FunctionDef( StmtFunctionDef { + range: 18..44, name: Identifier( "__init__", ), @@ -64,11 +66,11 @@ expression: "parse_program(source, \"\").unwrap()" decorator_list: [], returns: None, type_comment: None, - range: 18..44, }, ), FunctionDef( StmtFunctionDef { + range: 46..98, name: Identifier( "method_with_default", ), @@ -99,11 +101,11 @@ expression: "parse_program(source, \"\").unwrap()" defaults: [ Constant( ExprConstant { + range: 80..89, value: Str( "default", ), kind: None, - range: 80..89, }, ), ], @@ -119,12 +121,10 @@ expression: "parse_program(source, \"\").unwrap()" decorator_list: [], returns: None, type_comment: None, - range: 46..98, }, ), ], decorator_list: [], - range: 0..98, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap index 81548a6..38fcb30 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap @@ -4,42 +4,43 @@ expression: parse_ast --- DictComp( ExprDictComp { + range: 0..19, key: Name( ExprName { + range: 1..3, id: Identifier( "x1", ), ctx: Load, - range: 1..3, }, ), value: Name( ExprName { + range: 5..7, id: Identifier( "x2", ), ctx: Load, - range: 5..7, }, ), generators: [ Comprehension { target: Name( ExprName { + range: 12..13, id: Identifier( "y", ), ctx: Store, - range: 12..13, }, ), iter: Name( ExprName { + range: 17..18, id: Identifier( "z", ), ctx: Load, - range: 17..18, }, ), ifs: [], @@ -47,6 +48,5 @@ DictComp( range: (), }, ], - range: 0..19, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap index b64c8fe..d81ad35 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap @@ -4,50 +4,51 @@ expression: parse_ast --- ListComp( ExprListComp { + range: 0..48, elt: Name( ExprName { + range: 1..2, id: Identifier( "x", ), ctx: Load, - range: 1..2, }, ), generators: [ Comprehension { target: Tuple( ExprTuple { + range: 7..12, elts: [ Name( ExprName { + range: 7..8, id: Identifier( "y", ), ctx: Store, - range: 7..8, }, ), Name( ExprName { + range: 10..12, id: Identifier( "y2", ), ctx: Store, - range: 10..12, }, ), ], ctx: Store, - range: 7..12, }, ), iter: Name( ExprName { + range: 16..17, id: Identifier( "z", ), ctx: Load, - range: 16..17, }, ), ifs: [], @@ -57,32 +58,33 @@ ListComp( Comprehension { target: Name( ExprName { + range: 22..23, id: Identifier( "a", ), ctx: Store, - range: 22..23, }, ), iter: Name( ExprName { + range: 27..28, id: Identifier( "b", ), ctx: Load, - range: 27..28, }, ), ifs: [ Compare( ExprCompare { + range: 32..37, left: Name( ExprName { + range: 32..33, id: Identifier( "a", ), ctx: Load, - range: 32..33, }, ), ops: [ @@ -91,26 +93,26 @@ ListComp( comparators: [ Constant( ExprConstant { + range: 36..37, value: Int( 5, ), kind: None, - range: 36..37, }, ), ], - range: 32..37, }, ), Compare( ExprCompare { + range: 41..47, left: Name( ExprName { + range: 41..42, id: Identifier( "a", ), ctx: Load, - range: 41..42, }, ), ops: [ @@ -119,15 +121,14 @@ ListComp( comparators: [ Constant( ExprConstant { + range: 45..47, value: Int( 10, ), kind: None, - range: 45..47, }, ), ], - range: 41..47, }, ), ], @@ -135,6 +136,5 @@ ListComp( range: (), }, ], - range: 0..48, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap index 6c72de4..ee54755 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap @@ -5,23 +5,23 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..14, value: JoinedStr( ExprJoinedStr { + range: 0..14, values: [ Constant( ExprConstant { + range: 0..14, value: Str( "Hello world", ), kind: None, - range: 0..14, }, ), ], - range: 0..14, }, ), - range: 0..14, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap index 69b2b81..560fe2f 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap @@ -4,33 +4,34 @@ expression: parse_ast --- GeneratorExp( ExprGeneratorExp { + range: 0..14, elt: Name( ExprName { + range: 1..2, id: Identifier( "x", ), ctx: Load, - range: 1..2, }, ), generators: [ Comprehension { target: Name( ExprName { + range: 7..8, id: Identifier( "y", ), ctx: Store, - range: 7..8, }, ), iter: Name( ExprName { + range: 12..13, id: Identifier( "z", ), ctx: Load, - range: 12..13, }, ), ifs: [], @@ -38,6 +39,5 @@ GeneratorExp( range: (), }, ], - range: 0..14, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap index 6ab4b49..76a73d2 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap @@ -5,80 +5,80 @@ expression: parse_ast [ If( StmtIf { + range: 0..28, test: Constant( ExprConstant { + range: 3..4, value: Int( 1, ), kind: None, - range: 3..4, }, ), body: [ Expr( StmtExpr { + range: 6..8, value: Constant( ExprConstant { + range: 6..8, value: Int( 10, ), kind: None, - range: 6..8, }, ), - range: 6..8, }, ), ], orelse: [ If( StmtIf { + range: 9..28, test: Constant( ExprConstant { + range: 14..15, value: Int( 2, ), kind: None, - range: 14..15, }, ), body: [ Expr( StmtExpr { + range: 17..19, value: Constant( ExprConstant { + range: 17..19, value: Int( 20, ), kind: None, - range: 17..19, }, ), - range: 17..19, }, ), ], orelse: [ Expr( StmtExpr { + range: 26..28, value: Constant( ExprConstant { + range: 26..28, value: Int( 30, ), kind: None, - range: 26..28, }, ), - range: 26..28, }, ), ], - range: 9..28, }, ), ], - range: 0..28, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap index 8cf8ac1..d0ec95f 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap @@ -4,56 +4,57 @@ expression: parse_ast --- GeneratorExp( ExprGeneratorExp { + range: 0..26, elt: IfExp( ExprIfExp { + range: 1..14, test: Name( ExprName { + range: 6..7, id: Identifier( "y", ), ctx: Load, - range: 6..7, }, ), body: Name( ExprName { + range: 1..2, id: Identifier( "x", ), ctx: Load, - range: 1..2, }, ), orelse: Name( ExprName { + range: 13..14, id: Identifier( "y", ), ctx: Load, - range: 13..14, }, ), - range: 1..14, }, ), generators: [ Comprehension { target: Name( ExprName { + range: 19..20, id: Identifier( "y", ), ctx: Store, - range: 19..20, }, ), iter: Name( ExprName { + range: 24..25, id: Identifier( "z", ), ctx: Load, - range: 24..25, }, ), ifs: [], @@ -61,6 +62,5 @@ GeneratorExp( range: (), }, ], - range: 0..26, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap index 4e29e9c..c190539 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap @@ -5,25 +5,27 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..32, value: Call( ExprCall { + range: 0..32, func: Name( ExprName { + range: 0..7, id: Identifier( "my_func", ), ctx: Load, - range: 0..7, }, ), args: [ Constant( ExprConstant { + range: 8..20, value: Str( "positional", ), kind: None, - range: 8..20, }, ), ], @@ -36,20 +38,18 @@ expression: parse_ast ), value: Constant( ExprConstant { + range: 30..31, value: Int( 2, ), kind: None, - range: 30..31, }, ), range: 22..31, }, ], - range: 0..32, }, ), - range: 0..32, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap index f4b1564..9e0aec4 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap @@ -5,8 +5,10 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..18, value: Lambda( ExprLambda { + range: 0..18, args: Arguments { posonlyargs: [], args: [ @@ -36,32 +38,30 @@ expression: parse_ast }, body: BinOp( ExprBinOp { + range: 13..18, left: Name( ExprName { + range: 13..14, id: Identifier( "x", ), ctx: Load, - range: 13..14, }, ), op: Mult, right: Name( ExprName { + range: 17..18, id: Identifier( "y", ), ctx: Load, - range: 17..18, }, ), - range: 13..18, }, ), - range: 0..18, }, ), - range: 0..18, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap index df3b0b6..d935d00 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap @@ -4,33 +4,34 @@ expression: parse_ast --- ListComp( ExprListComp { + range: 0..14, elt: Name( ExprName { + range: 1..2, id: Identifier( "x", ), ctx: Load, - range: 1..2, }, ), generators: [ Comprehension { target: Name( ExprName { + range: 7..8, id: Identifier( "y", ), ctx: Store, - range: 7..8, }, ), iter: Name( ExprName { + range: 12..13, id: Identifier( "z", ), ctx: Load, - range: 12..13, }, ), ifs: [], @@ -38,6 +39,5 @@ ListComp( range: (), }, ], - range: 0..14, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap index 0cb009f..cfe0baf 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap @@ -4,62 +4,63 @@ expression: parse_ast --- GeneratorExp( ExprGeneratorExp { + range: 0..23, elt: NamedExpr( ExprNamedExpr { + range: 1..11, target: Name( ExprName { + range: 1..2, id: Identifier( "x", ), ctx: Store, - range: 1..2, }, ), value: BinOp( ExprBinOp { + range: 6..11, left: Name( ExprName { + range: 6..7, id: Identifier( "y", ), ctx: Load, - range: 6..7, }, ), op: Add, right: Constant( ExprConstant { + range: 10..11, value: Int( 1, ), kind: None, - range: 10..11, }, ), - range: 6..11, }, ), - range: 1..11, }, ), generators: [ Comprehension { target: Name( ExprName { + range: 16..17, id: Identifier( "y", ), ctx: Store, - range: 16..17, }, ), iter: Name( ExprName { + range: 21..22, id: Identifier( "z", ), ctx: Load, - range: 21..22, }, ), ifs: [], @@ -67,6 +68,5 @@ GeneratorExp( range: (), }, ], - range: 0..23, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap index d5c6d0e..af722c3 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap @@ -5,42 +5,42 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..23, value: Call( ExprCall { + range: 0..23, func: Name( ExprName { + range: 0..5, id: Identifier( "print", ), ctx: Load, - range: 0..5, }, ), args: [ Constant( ExprConstant { + range: 6..19, value: Str( "Hello world", ), kind: None, - range: 6..19, }, ), Constant( ExprConstant { + range: 21..22, value: Int( 2, ), kind: None, - range: 21..22, }, ), ], keywords: [], - range: 0..23, }, ), - range: 0..23, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap index a214015..68b7511 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap @@ -5,33 +5,33 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..20, value: Call( ExprCall { + range: 0..20, func: Name( ExprName { + range: 0..5, id: Identifier( "print", ), ctx: Load, - range: 0..5, }, ), args: [ Constant( ExprConstant { + range: 6..19, value: Str( "Hello world", ), kind: None, - range: 6..19, }, ), ], keywords: [], - range: 0..20, }, ), - range: 0..20, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap index d2a0dfa..ab4a453 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..13, value: Constant( ExprConstant { + range: 0..13, value: Str( "Hello world", ), kind: None, - range: 0..13, }, ), - range: 0..13, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap index 1d8fb5d..c0172d1 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap @@ -5,62 +5,62 @@ expression: "parse_program(source, \"\").unwrap()" [ Assign( StmtAssign { + range: 0..11, targets: [ Tuple( ExprTuple { + range: 0..4, elts: [ Name( ExprName { + range: 0..1, id: Identifier( "a", ), ctx: Store, - range: 0..1, }, ), Name( ExprName { + range: 3..4, id: Identifier( "b", ), ctx: Store, - range: 3..4, }, ), ], ctx: Store, - range: 0..4, }, ), ], value: Tuple( ExprTuple { + range: 7..11, elts: [ Constant( ExprConstant { + range: 7..8, value: Int( 4, ), kind: None, - range: 7..8, }, ), Constant( ExprConstant { + range: 10..11, value: Int( 5, ), kind: None, - range: 10..11, }, ), ], ctx: Load, - range: 7..11, }, ), type_comment: None, - range: 0..11, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__patma.snap b/parser/src/snapshots/rustpython_parser__parser__tests__patma.snap index fb6319c..4ef5f8c 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__patma.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__patma.snap @@ -5,213 +5,214 @@ expression: parse_ast [ Match( StmtMatch { + range: 67..103, subject: Name( ExprName { + range: 73..74, id: Identifier( "x", ), ctx: Load, - range: 73..74, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 85..88, value: UnaryOp( ExprUnaryOp { + range: 85..88, op: USub, operand: Constant( ExprConstant { + range: 86..88, value: Complex { real: 0.0, imag: 0.0, }, kind: None, - range: 86..88, }, ), - range: 85..88, }, ), - range: 85..88, }, ), guard: None, body: [ Assign( StmtAssign { + range: 98..103, targets: [ Name( ExprName { + range: 98..99, id: Identifier( "y", ), ctx: Store, - range: 98..99, }, ), ], value: Constant( ExprConstant { + range: 102..103, value: Int( 0, ), kind: None, - range: 102..103, }, ), type_comment: None, - range: 98..103, }, ), ], range: (), }, ], - range: 67..103, }, ), Match( StmtMatch { + range: 126..167, subject: Name( ExprName { + range: 132..133, id: Identifier( "x", ), ctx: Load, - range: 132..133, }, ), cases: [ MatchCase { pattern: MatchClass( PatternMatchClass { + range: 144..152, cls: Name( ExprName { + range: 144..149, id: Identifier( "bytes", ), ctx: Load, - range: 144..149, }, ), patterns: [ MatchAs( PatternMatchAs { + range: 150..151, pattern: None, name: Some( Identifier( "z", ), ), - range: 150..151, }, ), ], kwd_attrs: [], kwd_patterns: [], - range: 144..152, }, ), guard: None, body: [ Assign( StmtAssign { + range: 162..167, targets: [ Name( ExprName { + range: 162..163, id: Identifier( "y", ), ctx: Store, - range: 162..163, }, ), ], value: Constant( ExprConstant { + range: 166..167, value: Int( 0, ), kind: None, - range: 166..167, }, ), type_comment: None, - range: 162..167, }, ), ], range: (), }, ], - range: 126..167, }, ), Match( StmtMatch { + range: 190..260, subject: Name( ExprName { + range: 196..197, id: Identifier( "x", ), ctx: Load, - range: 196..197, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 208..209, value: Constant( ExprConstant { + range: 208..209, value: Int( 0, ), kind: None, - range: 208..209, }, ), - range: 208..209, }, ), guard: Some( Constant( ExprConstant { + range: 213..214, value: Int( 0, ), kind: None, - range: 213..214, }, ), ), body: [ Assign( StmtAssign { + range: 224..229, targets: [ Name( ExprName { + range: 224..225, id: Identifier( "y", ), ctx: Store, - range: 224..225, }, ), ], value: Constant( ExprConstant { + range: 228..229, value: Int( 0, ), kind: None, - range: 228..229, }, ), type_comment: None, - range: 224..229, }, ), ], @@ -220,341 +221,341 @@ expression: parse_ast MatchCase { pattern: MatchValue( PatternMatchValue { + range: 239..240, value: Constant( ExprConstant { + range: 239..240, value: Int( 0, ), kind: None, - range: 239..240, }, ), - range: 239..240, }, ), guard: Some( Constant( ExprConstant { + range: 244..245, value: Int( 1, ), kind: None, - range: 244..245, }, ), ), body: [ Assign( StmtAssign { + range: 255..260, targets: [ Name( ExprName { + range: 255..256, id: Identifier( "y", ), ctx: Store, - range: 255..256, }, ), ], value: Constant( ExprConstant { + range: 259..260, value: Int( 1, ), kind: None, - range: 259..260, }, ), type_comment: None, - range: 255..260, }, ), ], range: (), }, ], - range: 190..260, }, ), Match( StmtMatch { + range: 283..332, subject: Constant( ExprConstant { + range: 289..290, value: Int( 3, ), kind: None, - range: 289..290, }, ), cases: [ MatchCase { pattern: MatchOr( PatternMatchOr { + range: 301..314, patterns: [ MatchValue( PatternMatchValue { + range: 301..302, value: Constant( ExprConstant { + range: 301..302, value: Int( 0, ), kind: None, - range: 301..302, }, ), - range: 301..302, }, ), MatchValue( PatternMatchValue { + range: 305..306, value: Constant( ExprConstant { + range: 305..306, value: Int( 1, ), kind: None, - range: 305..306, }, ), - range: 305..306, }, ), MatchValue( PatternMatchValue { + range: 309..310, value: Constant( ExprConstant { + range: 309..310, value: Int( 2, ), kind: None, - range: 309..310, }, ), - range: 309..310, }, ), MatchValue( PatternMatchValue { + range: 313..314, value: Constant( ExprConstant { + range: 313..314, value: Int( 3, ), kind: None, - range: 313..314, }, ), - range: 313..314, }, ), ], - range: 301..314, }, ), guard: None, body: [ Assign( StmtAssign { + range: 324..332, targets: [ Name( ExprName { + range: 324..325, id: Identifier( "x", ), ctx: Store, - range: 324..325, }, ), ], value: Constant( ExprConstant { + range: 328..332, value: Bool( true, ), kind: None, - range: 328..332, }, ), type_comment: None, - range: 324..332, }, ), ], range: (), }, ], - range: 283..332, }, ), Match( StmtMatch { + range: 355..403, subject: Name( ExprName { + range: 361..362, id: Identifier( "x", ), ctx: Load, - range: 361..362, }, ), cases: [ MatchCase { pattern: MatchOr( PatternMatchOr { + range: 373..388, patterns: [ MatchSequence( PatternMatchSequence { + range: 373..379, patterns: [ MatchValue( PatternMatchValue { + range: 374..375, value: Constant( ExprConstant { + range: 374..375, value: Int( 0, ), kind: None, - range: 374..375, }, ), - range: 374..375, }, ), MatchValue( PatternMatchValue { + range: 377..378, value: Constant( ExprConstant { + range: 377..378, value: Int( 1, ), kind: None, - range: 377..378, }, ), - range: 377..378, }, ), ], - range: 373..379, }, ), MatchSequence( PatternMatchSequence { + range: 382..388, patterns: [ MatchValue( PatternMatchValue { + range: 383..384, value: Constant( ExprConstant { + range: 383..384, value: Int( 1, ), kind: None, - range: 383..384, }, ), - range: 383..384, }, ), MatchValue( PatternMatchValue { + range: 386..387, value: Constant( ExprConstant { + range: 386..387, value: Int( 0, ), kind: None, - range: 386..387, }, ), - range: 386..387, }, ), ], - range: 382..388, }, ), ], - range: 373..388, }, ), guard: None, body: [ Assign( StmtAssign { + range: 398..403, targets: [ Name( ExprName { + range: 398..399, id: Identifier( "y", ), ctx: Store, - range: 398..399, }, ), ], value: Constant( ExprConstant { + range: 402..403, value: Int( 0, ), kind: None, - range: 402..403, }, ), type_comment: None, - range: 398..403, }, ), ], range: (), }, ], - range: 355..403, }, ), Match( StmtMatch { + range: 445..523, subject: Name( ExprName { + range: 451..452, id: Identifier( "x", ), ctx: Load, - range: 451..452, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 463..467, patterns: [ MatchStar( PatternMatchStar { - name: None, range: 464..466, + name: None, }, ), ], - range: 463..467, }, ), guard: None, body: [ Return( StmtReturn { + range: 477..489, value: Some( Constant( ExprConstant { + range: 484..489, value: Str( "seq", ), kind: None, - range: 484..489, }, ), ), - range: 477..489, }, ), ], @@ -563,138 +564,138 @@ expression: parse_ast MatchCase { pattern: MatchMapping( PatternMatchMapping { + range: 499..501, keys: [], patterns: [], rest: None, - range: 499..501, }, ), guard: None, body: [ Return( StmtReturn { + range: 511..523, value: Some( Constant( ExprConstant { + range: 518..523, value: Str( "map", ), kind: None, - range: 518..523, }, ), ), - range: 511..523, }, ), ], range: (), }, ], - range: 445..523, }, ), Match( StmtMatch { + range: 546..714, subject: Name( ExprName { + range: 552..553, id: Identifier( "x", ), ctx: Load, - range: 552..553, }, ), cases: [ MatchCase { pattern: MatchMapping( PatternMatchMapping { + range: 564..579, keys: [ Constant( ExprConstant { + range: 565..566, value: Int( 0, ), kind: None, - range: 565..566, }, ), ], patterns: [ MatchSequence( PatternMatchSequence { + range: 568..578, patterns: [ MatchValue( PatternMatchValue { + range: 569..570, value: Constant( ExprConstant { + range: 569..570, value: Int( 1, ), kind: None, - range: 569..570, }, ), - range: 569..570, }, ), MatchValue( PatternMatchValue { + range: 572..573, value: Constant( ExprConstant { + range: 572..573, value: Int( 2, ), kind: None, - range: 572..573, }, ), - range: 572..573, }, ), MatchMapping( PatternMatchMapping { + range: 575..577, keys: [], patterns: [], rest: None, - range: 575..577, }, ), ], - range: 568..578, }, ), ], rest: None, - range: 564..579, }, ), guard: None, body: [ Assign( StmtAssign { + range: 589..594, targets: [ Name( ExprName { + range: 589..590, id: Identifier( "y", ), ctx: Store, - range: 589..590, }, ), ], value: Constant( ExprConstant { + range: 593..594, value: Int( 0, ), kind: None, - range: 593..594, }, ), type_comment: None, - range: 589..594, }, ), ], @@ -703,236 +704,236 @@ expression: parse_ast MatchCase { pattern: MatchOr( PatternMatchOr { + range: 604..672, patterns: [ MatchMapping( PatternMatchMapping { + range: 604..626, keys: [ Constant( ExprConstant { + range: 605..606, value: Int( 0, ), kind: None, - range: 605..606, }, ), ], patterns: [ MatchOr( PatternMatchOr { + range: 608..625, patterns: [ MatchSequence( PatternMatchSequence { + range: 608..618, patterns: [ MatchValue( PatternMatchValue { + range: 609..610, value: Constant( ExprConstant { + range: 609..610, value: Int( 1, ), kind: None, - range: 609..610, }, ), - range: 609..610, }, ), MatchValue( PatternMatchValue { + range: 612..613, value: Constant( ExprConstant { + range: 612..613, value: Int( 2, ), kind: None, - range: 612..613, }, ), - range: 612..613, }, ), MatchMapping( PatternMatchMapping { + range: 615..617, keys: [], patterns: [], rest: None, - range: 615..617, }, ), ], - range: 608..618, }, ), MatchSingleton( PatternMatchSingleton { + range: 621..625, value: Bool( true, ), - range: 621..625, }, ), ], - range: 608..625, }, ), ], rest: None, - range: 604..626, }, ), MatchMapping( PatternMatchMapping { + range: 629..638, keys: [ Constant( ExprConstant { + range: 630..631, value: Int( 1, ), kind: None, - range: 630..631, }, ), ], patterns: [ MatchSequence( PatternMatchSequence { + range: 633..637, patterns: [ MatchSequence( PatternMatchSequence { - patterns: [], range: 634..636, + patterns: [], }, ), ], - range: 633..637, }, ), ], rest: None, - range: 629..638, }, ), MatchMapping( PatternMatchMapping { + range: 641..656, keys: [ Constant( ExprConstant { + range: 642..643, value: Int( 0, ), kind: None, - range: 642..643, }, ), ], patterns: [ MatchSequence( PatternMatchSequence { + range: 645..655, patterns: [ MatchValue( PatternMatchValue { + range: 646..647, value: Constant( ExprConstant { + range: 646..647, value: Int( 1, ), kind: None, - range: 646..647, }, ), - range: 646..647, }, ), MatchValue( PatternMatchValue { + range: 649..650, value: Constant( ExprConstant { + range: 649..650, value: Int( 2, ), kind: None, - range: 649..650, }, ), - range: 649..650, }, ), MatchMapping( PatternMatchMapping { + range: 652..654, keys: [], patterns: [], rest: None, - range: 652..654, }, ), ], - range: 645..655, }, ), ], rest: None, - range: 641..656, }, ), MatchSequence( PatternMatchSequence { - patterns: [], range: 659..661, + patterns: [], }, ), MatchValue( PatternMatchValue { + range: 664..667, value: Constant( ExprConstant { + range: 664..667, value: Str( "X", ), kind: None, - range: 664..667, }, ), - range: 664..667, }, ), MatchMapping( PatternMatchMapping { + range: 670..672, keys: [], patterns: [], rest: None, - range: 670..672, }, ), ], - range: 604..672, }, ), guard: None, body: [ Assign( StmtAssign { + range: 682..687, targets: [ Name( ExprName { + range: 682..683, id: Identifier( "y", ), ctx: Store, - range: 682..683, }, ), ], value: Constant( ExprConstant { + range: 686..687, value: Int( 1, ), kind: None, - range: 686..687, }, ), type_comment: None, - range: 682..687, }, ), ], @@ -941,512 +942,447 @@ expression: parse_ast MatchCase { pattern: MatchSequence( PatternMatchSequence { - patterns: [], range: 697..699, + patterns: [], }, ), guard: None, body: [ Assign( StmtAssign { + range: 709..714, targets: [ Name( ExprName { + range: 709..710, id: Identifier( "y", ), ctx: Store, - range: 709..710, }, ), ], value: Constant( ExprConstant { + range: 713..714, value: Int( 2, ), kind: None, - range: 713..714, }, ), type_comment: None, - range: 709..714, }, ), ], range: (), }, ], - range: 546..714, }, ), Match( StmtMatch { + range: 737..782, subject: Name( ExprName { + range: 743..744, id: Identifier( "x", ), ctx: Load, - range: 743..744, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 755..767, value: BinOp( ExprBinOp { + range: 755..767, left: Constant( ExprConstant { + range: 755..759, value: Float( 0.25, ), kind: None, - range: 755..759, }, ), op: Add, right: Constant( ExprConstant { + range: 762..767, value: Complex { real: 0.0, imag: 1.75, }, kind: None, - range: 762..767, }, ), - range: 755..767, }, ), - range: 755..767, }, ), guard: None, body: [ Assign( StmtAssign { + range: 777..782, targets: [ Name( ExprName { + range: 777..778, id: Identifier( "y", ), ctx: Store, - range: 777..778, }, ), ], value: Constant( ExprConstant { + range: 781..782, value: Int( 0, ), kind: None, - range: 781..782, }, ), type_comment: None, - range: 777..782, }, ), ], range: (), }, ], - range: 737..782, }, ), Match( StmtMatch { + range: 805..841, subject: Name( ExprName { + range: 811..812, id: Identifier( "x", ), ctx: Load, - range: 811..812, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 823..826, value: UnaryOp( ExprUnaryOp { + range: 823..826, op: USub, operand: Constant( ExprConstant { + range: 824..826, value: Complex { real: 0.0, imag: 0.0, }, kind: None, - range: 824..826, }, ), - range: 823..826, }, ), - range: 823..826, }, ), guard: None, body: [ Assign( StmtAssign { + range: 836..841, targets: [ Name( ExprName { + range: 836..837, id: Identifier( "y", ), ctx: Store, - range: 836..837, }, ), ], value: Constant( ExprConstant { + range: 840..841, value: Int( 0, ), kind: None, - range: 840..841, }, ), type_comment: None, - range: 836..841, }, ), ], range: (), }, ], - range: 805..841, }, ), Match( StmtMatch { + range: 864..913, subject: Constant( ExprConstant { + range: 870..871, value: Int( 4, ), kind: None, - range: 870..871, }, ), cases: [ MatchCase { pattern: MatchOr( PatternMatchOr { + range: 882..895, patterns: [ MatchValue( PatternMatchValue { + range: 882..883, value: Constant( ExprConstant { + range: 882..883, value: Int( 0, ), kind: None, - range: 882..883, }, ), - range: 882..883, }, ), MatchValue( PatternMatchValue { + range: 886..887, value: Constant( ExprConstant { + range: 886..887, value: Int( 1, ), kind: None, - range: 886..887, }, ), - range: 886..887, }, ), MatchValue( PatternMatchValue { + range: 890..891, value: Constant( ExprConstant { + range: 890..891, value: Int( 2, ), kind: None, - range: 890..891, }, ), - range: 890..891, }, ), MatchValue( PatternMatchValue { + range: 894..895, value: Constant( ExprConstant { + range: 894..895, value: Int( 3, ), kind: None, - range: 894..895, }, ), - range: 894..895, }, ), ], - range: 882..895, }, ), guard: None, body: [ Assign( StmtAssign { + range: 905..913, targets: [ Name( ExprName { + range: 905..906, id: Identifier( "x", ), ctx: Store, - range: 905..906, }, ), ], value: Constant( ExprConstant { + range: 909..913, value: Bool( true, ), kind: None, - range: 909..913, }, ), type_comment: None, - range: 905..913, }, ), ], range: (), }, ], - range: 864..913, }, ), Match( StmtMatch { + range: 936..975, subject: Name( ExprName { + range: 942..943, id: Identifier( "x", ), ctx: Load, - range: 942..943, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 954..955, value: Constant( ExprConstant { + range: 954..955, value: Int( 0, ), kind: None, - range: 954..955, }, ), - range: 954..955, }, ), guard: Some( Name( ExprName { + range: 959..960, id: Identifier( "x", ), ctx: Load, - range: 959..960, }, ), ), body: [ Assign( StmtAssign { + range: 970..975, targets: [ Name( ExprName { + range: 970..971, id: Identifier( "y", ), ctx: Store, - range: 970..971, }, ), ], value: Constant( ExprConstant { + range: 974..975, value: Int( 0, ), kind: None, - range: 974..975, }, ), type_comment: None, - range: 970..975, }, ), ], range: (), }, ], - range: 936..975, }, ), Match( StmtMatch { + range: 998..1098, subject: Name( ExprName { + range: 1004..1005, id: Identifier( "x", ), ctx: Load, - range: 1004..1005, }, ), cases: [ MatchCase { pattern: MatchMapping( PatternMatchMapping { - keys: [ - Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1017..1018, - }, - ), - ], - patterns: [ - MatchValue( - PatternMatchValue { - value: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1020..1021, - }, - ), - range: 1020..1021, - }, - ), - ], - rest: None, range: 1016..1022, - }, - ), - guard: None, - body: [ - Assign( - StmtAssign { - targets: [ - Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1032..1033, - }, - ), - ], - value: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1036..1037, - }, - ), - type_comment: None, - range: 1032..1037, - }, - ), - ], - range: (), - }, - MatchCase { - pattern: MatchMapping( - PatternMatchMapping { keys: [ Constant( ExprConstant { + range: 1017..1018, value: Int( - 0, + 1, ), kind: None, - range: 1048..1049, }, ), ], patterns: [ MatchValue( PatternMatchValue { + range: 1020..1021, value: Constant( ExprConstant { + range: 1020..1021, value: Int( 0, ), kind: None, - range: 1051..1052, }, ), - range: 1051..1052, }, ), ], rest: None, - range: 1047..1053, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1032..1037, targets: [ Name( ExprName { + range: 1032..1033, id: Identifier( "y", ), ctx: Store, - range: 1063..1064, }, ), ], value: Constant( ExprConstant { + range: 1036..1037, value: Int( - 1, + 0, ), kind: None, - range: 1067..1068, }, ), type_comment: None, - range: 1063..1068, }, ), ], @@ -1455,6 +1391,72 @@ expression: parse_ast MatchCase { pattern: MatchMapping( PatternMatchMapping { + range: 1047..1053, + keys: [ + Constant( + ExprConstant { + range: 1048..1049, + value: Int( + 0, + ), + kind: None, + }, + ), + ], + patterns: [ + MatchValue( + PatternMatchValue { + range: 1051..1052, + value: Constant( + ExprConstant { + range: 1051..1052, + value: Int( + 0, + ), + kind: None, + }, + ), + }, + ), + ], + rest: None, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + range: 1063..1068, + targets: [ + Name( + ExprName { + range: 1063..1064, + id: Identifier( + "y", + ), + ctx: Store, + }, + ), + ], + value: Constant( + ExprConstant { + range: 1067..1068, + value: Int( + 1, + ), + kind: None, + }, + ), + type_comment: None, + }, + ), + ], + range: (), + }, + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { + range: 1078..1083, keys: [], patterns: [], rest: Some( @@ -1462,165 +1464,164 @@ expression: parse_ast "z", ), ), - range: 1078..1083, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1093..1098, targets: [ Name( ExprName { + range: 1093..1094, id: Identifier( "y", ), ctx: Store, - range: 1093..1094, }, ), ], value: Constant( ExprConstant { + range: 1097..1098, value: Int( 2, ), kind: None, - range: 1097..1098, }, ), type_comment: None, - range: 1093..1098, }, ), ], range: (), }, ], - range: 998..1098, }, ), Match( StmtMatch { + range: 1121..1162, subject: Call( ExprCall { + range: 1127..1132, func: Name( ExprName { + range: 1127..1130, id: Identifier( "Seq", ), ctx: Load, - range: 1127..1130, }, ), args: [], keywords: [], - range: 1127..1132, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 1143..1147, patterns: [ MatchStar( PatternMatchStar { - name: None, range: 1144..1146, + name: None, }, ), ], - range: 1143..1147, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1157..1162, targets: [ Name( ExprName { + range: 1157..1158, id: Identifier( "y", ), ctx: Store, - range: 1157..1158, }, ), ], value: Constant( ExprConstant { + range: 1161..1162, value: Int( 0, ), kind: None, - range: 1161..1162, }, ), type_comment: None, - range: 1157..1162, }, ), ], range: (), }, ], - range: 1121..1162, }, ), Match( StmtMatch { + range: 1185..1245, subject: Name( ExprName { + range: 1191..1192, id: Identifier( "x", ), ctx: Load, - range: 1191..1192, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 1203..1204, value: Constant( ExprConstant { + range: 1203..1204, value: Int( 1, ), kind: None, - range: 1203..1204, }, ), - range: 1203..1204, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1214..1219, targets: [ Name( ExprName { + range: 1214..1215, id: Identifier( "y", ), ctx: Store, - range: 1214..1215, }, ), ], value: Constant( ExprConstant { + range: 1218..1219, value: Int( 0, ), kind: None, - range: 1218..1219, }, ), type_comment: None, - range: 1214..1219, }, ), ], @@ -1629,324 +1630,324 @@ expression: parse_ast MatchCase { pattern: MatchValue( PatternMatchValue { + range: 1229..1230, value: Constant( ExprConstant { + range: 1229..1230, value: Int( 1, ), kind: None, - range: 1229..1230, }, ), - range: 1229..1230, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1240..1245, targets: [ Name( ExprName { + range: 1240..1241, id: Identifier( "y", ), ctx: Store, - range: 1240..1241, }, ), ], value: Constant( ExprConstant { + range: 1244..1245, value: Int( 1, ), kind: None, - range: 1244..1245, }, ), type_comment: None, - range: 1240..1245, }, ), ], range: (), }, ], - range: 1185..1245, }, ), Match( StmtMatch { + range: 1268..1315, subject: Name( ExprName { + range: 1274..1275, id: Identifier( "x", ), ctx: Load, - range: 1274..1275, }, ), cases: [ MatchCase { pattern: MatchMapping( PatternMatchMapping { + range: 1286..1298, keys: [ Constant( ExprConstant { + range: 1287..1292, value: Str( "foo", ), kind: None, - range: 1287..1292, }, ), ], patterns: [ MatchAs( PatternMatchAs { + range: 1294..1297, pattern: None, name: Some( Identifier( "bar", ), ), - range: 1294..1297, }, ), ], rest: None, - range: 1286..1298, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1308..1315, targets: [ Name( ExprName { + range: 1308..1309, id: Identifier( "y", ), ctx: Store, - range: 1308..1309, }, ), ], value: Name( ExprName { + range: 1312..1315, id: Identifier( "bar", ), ctx: Load, - range: 1312..1315, }, ), type_comment: None, - range: 1308..1315, }, ), ], range: (), }, ], - range: 1268..1315, }, ), Match( StmtMatch { + range: 1338..1392, subject: Tuple( ExprTuple { + range: 1344..1353, elts: [ Constant( ExprConstant { + range: 1345..1346, value: Int( 0, ), kind: None, - range: 1345..1346, }, ), Constant( ExprConstant { + range: 1348..1349, value: Int( 1, ), kind: None, - range: 1348..1349, }, ), Constant( ExprConstant { + range: 1351..1352, value: Int( 2, ), kind: None, - range: 1351..1352, }, ), ], ctx: Load, - range: 1344..1353, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 1364..1377, patterns: [ MatchValue( PatternMatchValue { + range: 1365..1366, value: Constant( ExprConstant { + range: 1365..1366, value: Int( 0, ), kind: None, - range: 1365..1366, }, ), - range: 1365..1366, }, ), MatchValue( PatternMatchValue { + range: 1368..1369, value: Constant( ExprConstant { + range: 1368..1369, value: Int( 1, ), kind: None, - range: 1368..1369, }, ), - range: 1368..1369, }, ), MatchStar( PatternMatchStar { + range: 1371..1373, name: Some( Identifier( "x", ), ), - range: 1371..1373, }, ), MatchValue( PatternMatchValue { + range: 1375..1376, value: Constant( ExprConstant { + range: 1375..1376, value: Int( 2, ), kind: None, - range: 1375..1376, }, ), - range: 1375..1376, }, ), ], - range: 1364..1377, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1387..1392, targets: [ Name( ExprName { + range: 1387..1388, id: Identifier( "y", ), ctx: Store, - range: 1387..1388, }, ), ], value: Constant( ExprConstant { + range: 1391..1392, value: Int( 0, ), kind: None, - range: 1391..1392, }, ), type_comment: None, - range: 1387..1392, }, ), ], range: (), }, ], - range: 1338..1392, }, ), Match( StmtMatch { + range: 1415..1529, subject: Name( ExprName { + range: 1421..1422, id: Identifier( "x", ), ctx: Load, - range: 1421..1422, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 1433..1436, patterns: [ MatchValue( PatternMatchValue { + range: 1434..1435, value: Constant( ExprConstant { + range: 1434..1435, value: Int( 0, ), kind: None, - range: 1434..1435, }, ), - range: 1434..1435, }, ), ], - range: 1433..1436, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1446..1451, targets: [ Name( ExprName { + range: 1446..1447, id: Identifier( "y", ), ctx: Store, - range: 1446..1447, }, ), ], value: Constant( ExprConstant { + range: 1450..1451, value: Int( 0, ), kind: None, - range: 1450..1451, }, ), type_comment: None, - range: 1446..1451, }, ), ], @@ -1955,113 +1956,113 @@ expression: parse_ast MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 1461..1467, patterns: [ MatchValue( PatternMatchValue { + range: 1462..1463, value: Constant( ExprConstant { + range: 1462..1463, value: Int( 1, ), kind: None, - range: 1462..1463, }, ), - range: 1462..1463, }, ), MatchValue( PatternMatchValue { + range: 1465..1466, value: Constant( ExprConstant { + range: 1465..1466, value: Int( 0, ), kind: None, - range: 1465..1466, }, ), - range: 1465..1466, }, ), ], - range: 1461..1467, }, ), guard: Some( NamedExpr( ExprNamedExpr { + range: 1472..1482, target: Name( ExprName { + range: 1472..1473, id: Identifier( "x", ), ctx: Store, - range: 1472..1473, }, ), value: Subscript( ExprSubscript { + range: 1477..1482, value: Name( ExprName { + range: 1477..1478, id: Identifier( "x", ), ctx: Load, - range: 1477..1478, }, ), slice: Slice( ExprSlice { + range: 1479..1481, lower: None, upper: Some( Constant( ExprConstant { + range: 1480..1481, value: Int( 0, ), kind: None, - range: 1480..1481, }, ), ), step: None, - range: 1479..1481, }, ), ctx: Load, - range: 1477..1482, }, ), - range: 1472..1482, }, ), ), body: [ Assign( StmtAssign { + range: 1493..1498, targets: [ Name( ExprName { + range: 1493..1494, id: Identifier( "y", ), ctx: Store, - range: 1493..1494, }, ), ], value: Constant( ExprConstant { + range: 1497..1498, value: Int( 1, ), kind: None, - range: 1497..1498, }, ), type_comment: None, - range: 1493..1498, }, ), ], @@ -2070,621 +2071,621 @@ expression: parse_ast MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 1508..1514, patterns: [ MatchValue( PatternMatchValue { + range: 1509..1510, value: Constant( ExprConstant { + range: 1509..1510, value: Int( 1, ), kind: None, - range: 1509..1510, }, ), - range: 1509..1510, }, ), MatchValue( PatternMatchValue { + range: 1512..1513, value: Constant( ExprConstant { + range: 1512..1513, value: Int( 0, ), kind: None, - range: 1512..1513, }, ), - range: 1512..1513, }, ), ], - range: 1508..1514, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1524..1529, targets: [ Name( ExprName { + range: 1524..1525, id: Identifier( "y", ), ctx: Store, - range: 1524..1525, }, ), ], value: Constant( ExprConstant { + range: 1528..1529, value: Int( 2, ), kind: None, - range: 1528..1529, }, ), type_comment: None, - range: 1524..1529, }, ), ], range: (), }, ], - range: 1415..1529, }, ), Match( StmtMatch { + range: 1552..1595, subject: Name( ExprName { + range: 1558..1559, id: Identifier( "w", ), ctx: Load, - range: 1558..1559, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 1570..1580, patterns: [ MatchAs( PatternMatchAs { + range: 1571..1572, pattern: None, name: Some( Identifier( "x", ), ), - range: 1571..1572, }, ), MatchAs( PatternMatchAs { + range: 1574..1575, pattern: None, name: Some( Identifier( "y", ), ), - range: 1574..1575, }, ), MatchStar( PatternMatchStar { - name: None, range: 1577..1579, + name: None, }, ), ], - range: 1570..1580, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1590..1595, targets: [ Name( ExprName { + range: 1590..1591, id: Identifier( "z", ), ctx: Store, - range: 1590..1591, }, ), ], value: Constant( ExprConstant { + range: 1594..1595, value: Int( 0, ), kind: None, - range: 1594..1595, }, ), type_comment: None, - range: 1590..1595, }, ), ], range: (), }, ], - range: 1552..1595, }, ), Match( StmtMatch { + range: 1618..1664, subject: Name( ExprName { + range: 1624..1625, id: Identifier( "x", ), ctx: Load, - range: 1624..1625, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 1636..1649, value: BinOp( ExprBinOp { + range: 1636..1649, left: UnaryOp( ExprUnaryOp { + range: 1636..1641, op: USub, operand: Constant( ExprConstant { + range: 1637..1641, value: Float( 0.25, ), kind: None, - range: 1637..1641, }, ), - range: 1636..1641, }, ), op: Sub, right: Constant( ExprConstant { + range: 1644..1649, value: Complex { real: 0.0, imag: 1.75, }, kind: None, - range: 1644..1649, }, ), - range: 1636..1649, }, ), - range: 1636..1649, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1659..1664, targets: [ Name( ExprName { + range: 1659..1660, id: Identifier( "y", ), ctx: Store, - range: 1659..1660, }, ), ], value: Constant( ExprConstant { + range: 1663..1664, value: Int( 0, ), kind: None, - range: 1663..1664, }, ), type_comment: None, - range: 1659..1664, }, ), ], range: (), }, ], - range: 1618..1664, }, ), Match( StmtMatch { + range: 1687..1726, subject: Tuple( ExprTuple { + range: 1693..1697, elts: [ Name( ExprName { + range: 1694..1695, id: Identifier( "x", ), ctx: Load, - range: 1694..1695, }, ), ], ctx: Load, - range: 1693..1697, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 1708..1711, patterns: [ MatchAs( PatternMatchAs { + range: 1709..1710, pattern: None, name: Some( Identifier( "y", ), ), - range: 1709..1710, }, ), ], - range: 1708..1711, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1721..1726, targets: [ Name( ExprName { + range: 1721..1722, id: Identifier( "z", ), ctx: Store, - range: 1721..1722, }, ), ], value: Constant( ExprConstant { + range: 1725..1726, value: Int( 0, ), kind: None, - range: 1725..1726, }, ), type_comment: None, - range: 1721..1726, }, ), ], range: (), }, ], - range: 1687..1726, }, ), Match( StmtMatch { + range: 1749..1789, subject: Name( ExprName { + range: 1755..1756, id: Identifier( "x", ), ctx: Load, - range: 1755..1756, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 1767..1774, value: Attribute( ExprAttribute { + range: 1767..1774, value: Attribute( ExprAttribute { + range: 1767..1772, value: Attribute( ExprAttribute { + range: 1767..1770, value: Name( ExprName { + range: 1767..1768, id: Identifier( "A", ), ctx: Load, - range: 1767..1768, }, ), attr: Identifier( "B", ), ctx: Load, - range: 1767..1770, }, ), attr: Identifier( "C", ), ctx: Load, - range: 1767..1772, }, ), attr: Identifier( "D", ), ctx: Load, - range: 1767..1774, }, ), - range: 1767..1774, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1784..1789, targets: [ Name( ExprName { + range: 1784..1785, id: Identifier( "y", ), ctx: Store, - range: 1784..1785, }, ), ], value: Constant( ExprConstant { + range: 1788..1789, value: Int( 0, ), kind: None, - range: 1788..1789, }, ), type_comment: None, - range: 1784..1789, }, ), ], range: (), }, ], - range: 1749..1789, }, ), Match( StmtMatch { + range: 1812..1849, subject: Name( ExprName { + range: 1818..1819, id: Identifier( "x", ), ctx: Load, - range: 1818..1819, }, ), cases: [ MatchCase { pattern: MatchSingleton( PatternMatchSingleton { - value: None, range: 1830..1834, + value: None, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1844..1849, targets: [ Name( ExprName { + range: 1844..1845, id: Identifier( "y", ), ctx: Store, - range: 1844..1845, }, ), ], value: Constant( ExprConstant { + range: 1848..1849, value: Int( 0, ), kind: None, - range: 1848..1849, }, ), type_comment: None, - range: 1844..1849, }, ), ], range: (), }, ], - range: 1812..1849, }, ), Match( StmtMatch { + range: 1872..1906, subject: Name( ExprName { + range: 1878..1879, id: Identifier( "x", ), ctx: Load, - range: 1878..1879, }, ), cases: [ MatchCase { pattern: MatchValue( PatternMatchValue { + range: 1890..1891, value: Constant( ExprConstant { + range: 1890..1891, value: Int( 0, ), kind: None, - range: 1890..1891, }, ), - range: 1890..1891, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1901..1906, targets: [ Name( ExprName { + range: 1901..1902, id: Identifier( "y", ), ctx: Store, - range: 1901..1902, }, ), ], value: Constant( ExprConstant { + range: 1905..1906, value: Int( 0, ), kind: None, - range: 1905..1906, }, ), type_comment: None, - range: 1901..1906, }, ), ], range: (), }, ], - range: 1872..1906, }, ), Match( StmtMatch { + range: 1929..1967, subject: Name( ExprName { + range: 1935..1936, id: Identifier( "x", ), ctx: Load, - range: 1935..1936, }, ), cases: [ MatchCase { pattern: MatchSingleton( PatternMatchSingleton { + range: 1947..1952, value: Bool( false, ), - range: 1947..1952, }, ), guard: None, body: [ Assign( StmtAssign { + range: 1962..1967, targets: [ Name( ExprName { + range: 1962..1963, id: Identifier( "y", ), ctx: Store, - range: 1962..1963, }, ), ], value: Constant( ExprConstant { + range: 1966..1967, value: Int( 0, ), kind: None, - range: 1966..1967, }, ), type_comment: None, - range: 1962..1967, }, ), ], range: (), }, ], - range: 1929..1967, }, ), Match( StmtMatch { + range: 1990..2081, subject: Name( ExprName { + range: 1996..1997, id: Identifier( "x", ), ctx: Load, - range: 1996..1997, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { - patterns: [], range: 2008..2010, + patterns: [], }, ), guard: None, body: [ Assign( StmtAssign { + range: 2020..2025, targets: [ Name( ExprName { + range: 2020..2021, id: Identifier( "y", ), ctx: Store, - range: 2020..2021, }, ), ], value: Constant( ExprConstant { + range: 2024..2025, value: Int( 0, ), kind: None, - range: 2024..2025, }, ), type_comment: None, - range: 2020..2025, }, ), ], @@ -2693,51 +2694,51 @@ expression: parse_ast MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 2035..2039, patterns: [ MatchValue( PatternMatchValue { + range: 2036..2038, value: Constant( ExprConstant { + range: 2036..2038, value: Str( "", ), kind: None, - range: 2036..2038, }, ), - range: 2036..2038, }, ), ], - range: 2035..2039, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2049..2054, targets: [ Name( ExprName { + range: 2049..2050, id: Identifier( "y", ), ctx: Store, - range: 2049..2050, }, ), ], value: Constant( ExprConstant { + range: 2053..2054, value: Int( 1, ), kind: None, - range: 2053..2054, }, ), type_comment: None, - range: 2049..2054, }, ), ], @@ -2746,230 +2747,232 @@ expression: parse_ast MatchCase { pattern: MatchValue( PatternMatchValue { + range: 2064..2066, value: Constant( ExprConstant { + range: 2064..2066, value: Str( "", ), kind: None, - range: 2064..2066, }, ), - range: 2064..2066, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2076..2081, targets: [ Name( ExprName { + range: 2076..2077, id: Identifier( "y", ), ctx: Store, - range: 2076..2077, }, ), ], value: Constant( ExprConstant { + range: 2080..2081, value: Int( 2, ), kind: None, - range: 2080..2081, }, ), type_comment: None, - range: 2076..2081, }, ), ], range: (), }, ], - range: 1990..2081, }, ), Match( StmtMatch { + range: 2104..2138, subject: Name( ExprName { + range: 2110..2111, id: Identifier( "x", ), ctx: Load, - range: 2110..2111, }, ), cases: [ MatchCase { pattern: MatchAs( PatternMatchAs { + range: 2122..2123, pattern: None, name: Some( Identifier( "z", ), ), - range: 2122..2123, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2133..2138, targets: [ Name( ExprName { + range: 2133..2134, id: Identifier( "y", ), ctx: Store, - range: 2133..2134, }, ), ], value: Constant( ExprConstant { + range: 2137..2138, value: Int( 0, ), kind: None, - range: 2137..2138, }, ), type_comment: None, - range: 2133..2138, }, ), ], range: (), }, ], - range: 2104..2138, }, ), Match( StmtMatch { + range: 2161..2207, subject: Name( ExprName { + range: 2167..2168, id: Identifier( "w", ), ctx: Load, - range: 2167..2168, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 2179..2192, patterns: [ MatchAs( PatternMatchAs { + range: 2180..2181, pattern: None, name: Some( Identifier( "x", ), ), - range: 2180..2181, }, ), MatchAs( PatternMatchAs { + range: 2183..2184, pattern: None, name: Some( Identifier( "y", ), ), - range: 2183..2184, }, ), MatchStar( PatternMatchStar { + range: 2186..2191, name: Some( Identifier( "rest", ), ), - range: 2186..2191, }, ), ], - range: 2179..2192, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2202..2207, targets: [ Name( ExprName { + range: 2202..2203, id: Identifier( "z", ), ctx: Store, - range: 2202..2203, }, ), ], value: Constant( ExprConstant { + range: 2206..2207, value: Int( 0, ), kind: None, - range: 2206..2207, }, ), type_comment: None, - range: 2202..2207, }, ), ], range: (), }, ], - range: 2161..2207, }, ), Match( StmtMatch { + range: 2230..2307, subject: Name( ExprName { + range: 2236..2237, id: Identifier( "x", ), ctx: Load, - range: 2236..2237, }, ), cases: [ MatchCase { pattern: MatchOr( PatternMatchOr { + range: 2248..2278, patterns: [ MatchAs( PatternMatchAs { + range: 2249..2255, pattern: Some( MatchValue( PatternMatchValue { + range: 2249..2250, value: Constant( ExprConstant { + range: 2249..2250, value: Int( 0, ), kind: None, - range: 2249..2250, }, ), - range: 2249..2250, }, ), ), @@ -2978,24 +2981,24 @@ expression: parse_ast "z", ), ), - range: 2249..2255, }, ), MatchAs( PatternMatchAs { + range: 2260..2266, pattern: Some( MatchValue( PatternMatchValue { + range: 2260..2261, value: Constant( ExprConstant { + range: 2260..2261, value: Int( 1, ), kind: None, - range: 2260..2261, }, ), - range: 2260..2261, }, ), ), @@ -3004,24 +3007,24 @@ expression: parse_ast "z", ), ), - range: 2260..2266, }, ), MatchAs( PatternMatchAs { + range: 2271..2277, pattern: Some( MatchValue( PatternMatchValue { + range: 2271..2272, value: Constant( ExprConstant { + range: 2271..2272, value: Int( 2, ), kind: None, - range: 2271..2272, }, ), - range: 2271..2272, }, ), ), @@ -3030,23 +3033,22 @@ expression: parse_ast "z", ), ), - range: 2271..2277, }, ), ], - range: 2248..2278, }, ), guard: Some( Compare( ExprCompare { + range: 2282..2292, left: Name( ExprName { + range: 2282..2283, id: Identifier( "z", ), ctx: Load, - range: 2282..2283, }, ), ops: [ @@ -3055,168 +3057,167 @@ expression: parse_ast comparators: [ BinOp( ExprBinOp { + range: 2287..2292, left: Name( ExprName { + range: 2287..2288, id: Identifier( "x", ), ctx: Load, - range: 2287..2288, }, ), op: Mod, right: Constant( ExprConstant { + range: 2291..2292, value: Int( 2, ), kind: None, - range: 2291..2292, }, ), - range: 2287..2292, }, ), ], - range: 2282..2292, }, ), ), body: [ Assign( StmtAssign { + range: 2302..2307, targets: [ Name( ExprName { + range: 2302..2303, id: Identifier( "y", ), ctx: Store, - range: 2302..2303, }, ), ], value: Constant( ExprConstant { + range: 2306..2307, value: Int( 0, ), kind: None, - range: 2306..2307, }, ), type_comment: None, - range: 2302..2307, }, ), ], range: (), }, ], - range: 2230..2307, }, ), Match( StmtMatch { + range: 2330..2499, subject: Name( ExprName { + range: 2336..2337, id: Identifier( "x", ), ctx: Load, - range: 2336..2337, }, ), cases: [ MatchCase { pattern: MatchMapping( PatternMatchMapping { + range: 2348..2363, keys: [ Constant( ExprConstant { + range: 2349..2350, value: Int( 0, ), kind: None, - range: 2349..2350, }, ), ], patterns: [ MatchSequence( PatternMatchSequence { + range: 2352..2362, patterns: [ MatchValue( PatternMatchValue { + range: 2353..2354, value: Constant( ExprConstant { + range: 2353..2354, value: Int( 1, ), kind: None, - range: 2353..2354, }, ), - range: 2353..2354, }, ), MatchValue( PatternMatchValue { + range: 2356..2357, value: Constant( ExprConstant { + range: 2356..2357, value: Int( 2, ), kind: None, - range: 2356..2357, }, ), - range: 2356..2357, }, ), MatchMapping( PatternMatchMapping { + range: 2359..2361, keys: [], patterns: [], rest: None, - range: 2359..2361, }, ), ], - range: 2352..2362, }, ), ], rest: None, - range: 2348..2363, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2373..2378, targets: [ Name( ExprName { + range: 2373..2374, id: Identifier( "y", ), ctx: Store, - range: 2373..2374, }, ), ], value: Constant( ExprConstant { + range: 2377..2378, value: Int( 0, ), kind: None, - range: 2377..2378, }, ), type_comment: None, - range: 2373..2378, }, ), ], @@ -3225,236 +3226,236 @@ expression: parse_ast MatchCase { pattern: MatchOr( PatternMatchOr { + range: 2388..2457, patterns: [ MatchMapping( PatternMatchMapping { + range: 2388..2411, keys: [ Constant( ExprConstant { + range: 2389..2390, value: Int( 0, ), kind: None, - range: 2389..2390, }, ), ], patterns: [ MatchOr( PatternMatchOr { + range: 2392..2410, patterns: [ MatchSequence( PatternMatchSequence { + range: 2392..2402, patterns: [ MatchValue( PatternMatchValue { + range: 2393..2394, value: Constant( ExprConstant { + range: 2393..2394, value: Int( 1, ), kind: None, - range: 2393..2394, }, ), - range: 2393..2394, }, ), MatchValue( PatternMatchValue { + range: 2396..2397, value: Constant( ExprConstant { + range: 2396..2397, value: Int( 2, ), kind: None, - range: 2396..2397, }, ), - range: 2396..2397, }, ), MatchMapping( PatternMatchMapping { + range: 2399..2401, keys: [], patterns: [], rest: None, - range: 2399..2401, }, ), ], - range: 2392..2402, }, ), MatchSingleton( PatternMatchSingleton { + range: 2405..2410, value: Bool( false, ), - range: 2405..2410, }, ), ], - range: 2392..2410, }, ), ], rest: None, - range: 2388..2411, }, ), MatchMapping( PatternMatchMapping { + range: 2414..2423, keys: [ Constant( ExprConstant { + range: 2415..2416, value: Int( 1, ), kind: None, - range: 2415..2416, }, ), ], patterns: [ MatchSequence( PatternMatchSequence { + range: 2418..2422, patterns: [ MatchSequence( PatternMatchSequence { - patterns: [], range: 2419..2421, + patterns: [], }, ), ], - range: 2418..2422, }, ), ], rest: None, - range: 2414..2423, }, ), MatchMapping( PatternMatchMapping { + range: 2426..2441, keys: [ Constant( ExprConstant { + range: 2427..2428, value: Int( 0, ), kind: None, - range: 2427..2428, }, ), ], patterns: [ MatchSequence( PatternMatchSequence { + range: 2430..2440, patterns: [ MatchValue( PatternMatchValue { + range: 2431..2432, value: Constant( ExprConstant { + range: 2431..2432, value: Int( 1, ), kind: None, - range: 2431..2432, }, ), - range: 2431..2432, }, ), MatchValue( PatternMatchValue { + range: 2434..2435, value: Constant( ExprConstant { + range: 2434..2435, value: Int( 2, ), kind: None, - range: 2434..2435, }, ), - range: 2434..2435, }, ), MatchMapping( PatternMatchMapping { + range: 2437..2439, keys: [], patterns: [], rest: None, - range: 2437..2439, }, ), ], - range: 2430..2440, }, ), ], rest: None, - range: 2426..2441, }, ), MatchSequence( PatternMatchSequence { - patterns: [], range: 2444..2446, + patterns: [], }, ), MatchValue( PatternMatchValue { + range: 2449..2452, value: Constant( ExprConstant { + range: 2449..2452, value: Str( "X", ), kind: None, - range: 2449..2452, }, ), - range: 2449..2452, }, ), MatchMapping( PatternMatchMapping { + range: 2455..2457, keys: [], patterns: [], rest: None, - range: 2455..2457, }, ), ], - range: 2388..2457, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2467..2472, targets: [ Name( ExprName { + range: 2467..2468, id: Identifier( "y", ), ctx: Store, - range: 2467..2468, }, ), ], value: Constant( ExprConstant { + range: 2471..2472, value: Int( 1, ), kind: None, - range: 2471..2472, }, ), type_comment: None, - range: 2467..2472, }, ), ], @@ -3463,457 +3464,459 @@ expression: parse_ast MatchCase { pattern: MatchSequence( PatternMatchSequence { - patterns: [], range: 2482..2484, + patterns: [], }, ), guard: None, body: [ Assign( StmtAssign { + range: 2494..2499, targets: [ Name( ExprName { + range: 2494..2495, id: Identifier( "y", ), ctx: Store, - range: 2494..2495, }, ), ], value: Constant( ExprConstant { + range: 2498..2499, value: Int( 2, ), kind: None, - range: 2498..2499, }, ), type_comment: None, - range: 2494..2499, }, ), ], range: (), }, ], - range: 2330..2499, }, ), Match( StmtMatch { + range: 2522..2568, subject: Tuple( ExprTuple { + range: 2528..2537, elts: [ Constant( ExprConstant { + range: 2529..2530, value: Int( 0, ), kind: None, - range: 2529..2530, }, ), Constant( ExprConstant { + range: 2532..2533, value: Int( 1, ), kind: None, - range: 2532..2533, }, ), Constant( ExprConstant { + range: 2535..2536, value: Int( 2, ), kind: None, - range: 2535..2536, }, ), ], ctx: Load, - range: 2528..2537, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 2548..2553, patterns: [ MatchValue( PatternMatchValue { + range: 2548..2549, value: Constant( ExprConstant { + range: 2548..2549, value: Int( 0, ), kind: None, - range: 2548..2549, }, ), - range: 2548..2549, }, ), MatchStar( PatternMatchStar { + range: 2551..2553, name: Some( Identifier( "x", ), ), - range: 2551..2553, }, ), ], - range: 2548..2553, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2563..2568, targets: [ Name( ExprName { + range: 2563..2564, id: Identifier( "y", ), ctx: Store, - range: 2563..2564, }, ), ], value: Constant( ExprConstant { + range: 2567..2568, value: Int( 0, ), kind: None, - range: 2567..2568, }, ), type_comment: None, - range: 2563..2568, }, ), ], range: (), }, ], - range: 2522..2568, }, ), Match( StmtMatch { + range: 2591..2638, subject: Tuple( ExprTuple { + range: 2597..2606, elts: [ Constant( ExprConstant { + range: 2598..2599, value: Int( 0, ), kind: None, - range: 2598..2599, }, ), Constant( ExprConstant { + range: 2601..2602, value: Int( 1, ), kind: None, - range: 2601..2602, }, ), Constant( ExprConstant { + range: 2604..2605, value: Int( 2, ), kind: None, - range: 2604..2605, }, ), ], ctx: Load, - range: 2597..2606, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 2617..2623, patterns: [ MatchStar( PatternMatchStar { + range: 2617..2619, name: Some( Identifier( "x", ), ), - range: 2617..2619, }, ), MatchValue( PatternMatchValue { + range: 2621..2622, value: Constant( ExprConstant { + range: 2621..2622, value: Int( 2, ), kind: None, - range: 2621..2622, }, ), - range: 2621..2622, }, ), ], - range: 2617..2623, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2633..2638, targets: [ Name( ExprName { + range: 2633..2634, id: Identifier( "y", ), ctx: Store, - range: 2633..2634, }, ), ], value: Constant( ExprConstant { + range: 2637..2638, value: Int( 0, ), kind: None, - range: 2637..2638, }, ), type_comment: None, - range: 2633..2638, }, ), ], range: (), }, ], - range: 2591..2638, }, ), Match( StmtMatch { + range: 2661..2697, subject: Name( ExprName { + range: 2667..2668, id: Identifier( "x", ), ctx: Load, - range: 2667..2668, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 2680..2682, patterns: [ MatchAs( PatternMatchAs { + range: 2680..2681, pattern: None, name: Some( Identifier( "y", ), ), - range: 2680..2681, }, ), ], - range: 2680..2682, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2692..2697, targets: [ Name( ExprName { + range: 2692..2693, id: Identifier( "z", ), ctx: Store, - range: 2692..2693, }, ), ], value: Constant( ExprConstant { + range: 2696..2697, value: Int( 0, ), kind: None, - range: 2696..2697, }, ), type_comment: None, - range: 2692..2697, }, ), ], range: (), }, ], - range: 2661..2697, }, ), Match( StmtMatch { + range: 2720..2760, subject: Tuple( ExprTuple { + range: 2720..2760, elts: [ Name( ExprName { + range: 2726..2727, id: Identifier( "w", ), ctx: Load, - range: 2726..2727, }, ), Name( ExprName { + range: 2729..2730, id: Identifier( "x", ), ctx: Load, - range: 2729..2730, }, ), ], ctx: Load, - range: 2720..2760, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 2741..2745, patterns: [ MatchAs( PatternMatchAs { + range: 2741..2742, pattern: None, name: Some( Identifier( "y", ), ), - range: 2741..2742, }, ), MatchAs( PatternMatchAs { + range: 2744..2745, pattern: None, name: Some( Identifier( "z", ), ), - range: 2744..2745, }, ), ], - range: 2741..2745, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2755..2760, targets: [ Name( ExprName { + range: 2755..2756, id: Identifier( "v", ), ctx: Store, - range: 2755..2756, }, ), ], value: Constant( ExprConstant { + range: 2759..2760, value: Int( 0, ), kind: None, - range: 2759..2760, }, ), type_comment: None, - range: 2755..2760, }, ), ], range: (), }, ], - range: 2720..2760, }, ), Match( StmtMatch { + range: 2783..2829, subject: NamedExpr( ExprNamedExpr { + range: 2789..2795, target: Name( ExprName { + range: 2789..2790, id: Identifier( "w", ), ctx: Store, - range: 2789..2790, }, ), value: Name( ExprName { + range: 2794..2795, id: Identifier( "x", ), ctx: Load, - range: 2794..2795, }, ), - range: 2789..2795, }, ), cases: [ MatchCase { pattern: MatchSequence( PatternMatchSequence { + range: 2807..2814, patterns: [ MatchAs( PatternMatchAs { + range: 2807..2813, pattern: Some( MatchAs( PatternMatchAs { + range: 2807..2808, pattern: None, name: Some( Identifier( "y", ), ), - range: 2807..2808, }, ), ), @@ -3922,46 +3925,43 @@ expression: parse_ast "v", ), ), - range: 2807..2813, }, ), ], - range: 2807..2814, }, ), guard: None, body: [ Assign( StmtAssign { + range: 2824..2829, targets: [ Name( ExprName { + range: 2824..2825, id: Identifier( "z", ), ctx: Store, - range: 2824..2825, }, ), ], value: Constant( ExprConstant { + range: 2828..2829, value: Int( 0, ), kind: None, - range: 2828..2829, }, ), type_comment: None, - range: 2824..2829, }, ), ], range: (), }, ], - range: 2783..2829, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__slice.snap b/parser/src/snapshots/rustpython_parser__parser__tests__slice.snap index 576e613..8622a68 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__slice.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__slice.snap @@ -4,54 +4,54 @@ expression: parse_ast --- Subscript( ExprSubscript { + range: 0..8, value: Name( ExprName { + range: 0..1, id: Identifier( "x", ), ctx: Load, - range: 0..1, }, ), slice: Slice( ExprSlice { + range: 2..7, lower: Some( Constant( ExprConstant { + range: 2..3, value: Int( 1, ), kind: None, - range: 2..3, }, ), ), upper: Some( Constant( ExprConstant { + range: 4..5, value: Int( 2, ), kind: None, - range: 4..5, }, ), ), step: Some( Constant( ExprConstant { + range: 6..7, value: Int( 3, ), kind: None, - range: 6..7, }, ), ), - range: 2..7, }, ), ctx: Load, - range: 0..8, }, ) diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap b/parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap index d16caad..8a43e4d 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap @@ -5,289 +5,289 @@ expression: parse_ast [ Assign( StmtAssign { + range: 0..36, targets: [ Name( ExprName { + range: 0..11, id: Identifier( "array_slice", ), ctx: Store, - range: 0..11, }, ), ], value: Subscript( ExprSubscript { + range: 14..36, value: Name( ExprName { + range: 14..19, id: Identifier( "array", ), ctx: Load, - range: 14..19, }, ), slice: Tuple( ExprTuple { + range: 20..35, elts: [ Constant( ExprConstant { + range: 20..21, value: Int( 0, ), kind: None, - range: 20..21, }, ), Starred( ExprStarred { + range: 23..31, value: Name( ExprName { + range: 24..31, id: Identifier( "indexes", ), ctx: Load, - range: 24..31, }, ), ctx: Load, - range: 23..31, }, ), UnaryOp( ExprUnaryOp { + range: 33..35, op: USub, operand: Constant( ExprConstant { + range: 34..35, value: Int( 1, ), kind: None, - range: 34..35, }, ), - range: 33..35, }, ), ], ctx: Load, - range: 20..35, }, ), ctx: Load, - range: 14..36, }, ), type_comment: None, - range: 0..36, }, ), Assign( StmtAssign { + range: 37..73, targets: [ Subscript( ExprSubscript { + range: 37..59, value: Name( ExprName { + range: 37..42, id: Identifier( "array", ), ctx: Load, - range: 37..42, }, ), slice: Tuple( ExprTuple { + range: 43..58, elts: [ Constant( ExprConstant { + range: 43..44, value: Int( 0, ), kind: None, - range: 43..44, }, ), Starred( ExprStarred { + range: 46..54, value: Name( ExprName { + range: 47..54, id: Identifier( "indexes", ), ctx: Load, - range: 47..54, }, ), ctx: Load, - range: 46..54, }, ), UnaryOp( ExprUnaryOp { + range: 56..58, op: USub, operand: Constant( ExprConstant { + range: 57..58, value: Int( 1, ), kind: None, - range: 57..58, }, ), - range: 56..58, }, ), ], ctx: Load, - range: 43..58, }, ), ctx: Store, - range: 37..59, }, ), ], value: Name( ExprName { + range: 62..73, id: Identifier( "array_slice", ), ctx: Load, - range: 62..73, }, ), type_comment: None, - range: 37..73, }, ), Expr( StmtExpr { + range: 74..119, value: Subscript( ExprSubscript { + range: 74..119, value: Name( ExprName { + range: 74..79, id: Identifier( "array", ), ctx: Load, - range: 74..79, }, ), slice: Tuple( ExprTuple { + range: 80..118, elts: [ Starred( ExprStarred { + range: 80..98, value: Name( ExprName { + range: 81..98, id: Identifier( "indexes_to_select", ), ctx: Load, - range: 81..98, }, ), ctx: Load, - range: 80..98, }, ), Starred( ExprStarred { + range: 100..118, value: Name( ExprName { + range: 101..118, id: Identifier( "indexes_to_select", ), ctx: Load, - range: 101..118, }, ), ctx: Load, - range: 100..118, }, ), ], ctx: Load, - range: 80..118, }, ), ctx: Load, - range: 74..119, }, ), - range: 74..119, }, ), Expr( StmtExpr { + range: 120..150, value: Subscript( ExprSubscript { + range: 120..150, value: Name( ExprName { + range: 120..125, id: Identifier( "array", ), ctx: Load, - range: 120..125, }, ), slice: Tuple( ExprTuple { + range: 126..149, elts: [ Slice( ExprSlice { + range: 126..129, lower: Some( Constant( ExprConstant { + range: 126..127, value: Int( 3, ), kind: None, - range: 126..127, }, ), ), upper: Some( Constant( ExprConstant { + range: 128..129, value: Int( 5, ), kind: None, - range: 128..129, }, ), ), step: None, - range: 126..129, }, ), Starred( ExprStarred { + range: 131..149, value: Name( ExprName { + range: 132..149, id: Identifier( "indexes_to_select", ), ctx: Load, - range: 132..149, }, ), ctx: Load, - range: 131..149, }, ), ], ctx: Load, - range: 126..149, }, ), ctx: Load, - range: 120..150, }, ), - range: 120..150, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__try.snap b/parser/src/snapshots/rustpython_parser__parser__tests__try.snap index d515022..c147b27 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__try.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__try.snap @@ -5,53 +5,55 @@ expression: parse_ast [ Try( StmtTry { + range: 0..134, body: [ Raise( StmtRaise { + range: 9..28, exc: Some( Call( ExprCall { + range: 15..28, func: Name( ExprName { + range: 15..25, id: Identifier( "ValueError", ), ctx: Load, - range: 15..25, }, ), args: [ Constant( ExprConstant { + range: 26..27, value: Int( 1, ), kind: None, - range: 26..27, }, ), ], keywords: [], - range: 15..28, }, ), ), cause: None, - range: 9..28, }, ), ], handlers: [ ExceptHandler( ExcepthandlerExceptHandler { + range: 29..82, type_: Some( Name( ExprName { + range: 36..45, id: Identifier( "TypeError", ), ctx: Load, - range: 36..45, }, ), ), @@ -63,91 +65,91 @@ expression: parse_ast body: [ Expr( StmtExpr { + range: 56..82, value: Call( ExprCall { + range: 56..82, func: Name( ExprName { + range: 56..61, id: Identifier( "print", ), ctx: Load, - range: 56..61, }, ), args: [ JoinedStr( ExprJoinedStr { + range: 62..81, values: [ Constant( ExprConstant { + range: 62..81, value: Str( "caught ", ), kind: None, - range: 62..81, }, ), FormattedValue( ExprFormattedValue { + range: 62..81, value: Call( ExprCall { + range: 72..79, func: Name( ExprName { + range: 72..76, id: Identifier( "type", ), ctx: Load, - range: 72..76, }, ), args: [ Name( ExprName { + range: 77..78, id: Identifier( "e", ), ctx: Load, - range: 77..78, }, ), ], keywords: [], - range: 72..79, }, ), conversion: Int( 0, ), format_spec: None, - range: 62..81, }, ), ], - range: 62..81, }, ), ], keywords: [], - range: 56..82, }, ), - range: 56..82, }, ), ], - range: 29..82, }, ), ExceptHandler( ExcepthandlerExceptHandler { + range: 83..134, type_: Some( Name( ExprName { + range: 90..97, id: Identifier( "OSError", ), ctx: Load, - range: 90..97, }, ), ), @@ -159,85 +161,83 @@ expression: parse_ast body: [ Expr( StmtExpr { + range: 108..134, value: Call( ExprCall { + range: 108..134, func: Name( ExprName { + range: 108..113, id: Identifier( "print", ), ctx: Load, - range: 108..113, }, ), args: [ JoinedStr( ExprJoinedStr { + range: 114..133, values: [ Constant( ExprConstant { + range: 114..133, value: Str( "caught ", ), kind: None, - range: 114..133, }, ), FormattedValue( ExprFormattedValue { + range: 114..133, value: Call( ExprCall { + range: 124..131, func: Name( ExprName { + range: 124..128, id: Identifier( "type", ), ctx: Load, - range: 124..128, }, ), args: [ Name( ExprName { + range: 129..130, id: Identifier( "e", ), ctx: Load, - range: 129..130, }, ), ], keywords: [], - range: 124..131, }, ), conversion: Int( 0, ), format_spec: None, - range: 114..133, }, ), ], - range: 114..133, }, ), ], keywords: [], - range: 108..134, }, ), - range: 108..134, }, ), ], - range: 83..134, }, ), ], orelse: [], finalbody: [], - range: 0..134, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__try_star.snap b/parser/src/snapshots/rustpython_parser__parser__tests__try_star.snap index 91192fa..9634857 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__try_star.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__try_star.snap @@ -5,165 +5,167 @@ expression: parse_ast [ TryStar( StmtTryStar { + range: 0..260, body: [ Raise( StmtRaise { + range: 9..98, exc: Some( Call( ExprCall { + range: 15..98, func: Name( ExprName { + range: 15..29, id: Identifier( "ExceptionGroup", ), ctx: Load, - range: 15..29, }, ), args: [ Constant( ExprConstant { + range: 30..34, value: Str( "eg", ), kind: None, - range: 30..34, }, ), List( ExprList { + range: 44..97, elts: [ Call( ExprCall { + range: 45..58, func: Name( ExprName { + range: 45..55, id: Identifier( "ValueError", ), ctx: Load, - range: 45..55, }, ), args: [ Constant( ExprConstant { + range: 56..57, value: Int( 1, ), kind: None, - range: 56..57, }, ), ], keywords: [], - range: 45..58, }, ), Call( ExprCall { + range: 60..72, func: Name( ExprName { + range: 60..69, id: Identifier( "TypeError", ), ctx: Load, - range: 60..69, }, ), args: [ Constant( ExprConstant { + range: 70..71, value: Int( 2, ), kind: None, - range: 70..71, }, ), ], keywords: [], - range: 60..72, }, ), Call( ExprCall { + range: 74..84, func: Name( ExprName { + range: 74..81, id: Identifier( "OSError", ), ctx: Load, - range: 74..81, }, ), args: [ Constant( ExprConstant { + range: 82..83, value: Int( 3, ), kind: None, - range: 82..83, }, ), ], keywords: [], - range: 74..84, }, ), Call( ExprCall { + range: 86..96, func: Name( ExprName { + range: 86..93, id: Identifier( "OSError", ), ctx: Load, - range: 86..93, }, ), args: [ Constant( ExprConstant { + range: 94..95, value: Int( 4, ), kind: None, - range: 94..95, }, ), ], keywords: [], - range: 86..96, }, ), ], ctx: Load, - range: 44..97, }, ), ], keywords: [], - range: 15..98, }, ), ), cause: None, - range: 9..98, }, ), ], handlers: [ ExceptHandler( ExcepthandlerExceptHandler { + range: 99..180, type_: Some( Name( ExprName { + range: 107..116, id: Identifier( "TypeError", ), ctx: Load, - range: 107..116, }, ), ), @@ -175,127 +177,127 @@ expression: parse_ast body: [ Expr( StmtExpr { + range: 127..180, value: Call( ExprCall { + range: 127..180, func: Name( ExprName { + range: 127..132, id: Identifier( "print", ), ctx: Load, - range: 127..132, }, ), args: [ JoinedStr( ExprJoinedStr { + range: 133..179, values: [ Constant( ExprConstant { + range: 133..179, value: Str( "caught ", ), kind: None, - range: 133..179, }, ), FormattedValue( ExprFormattedValue { + range: 133..179, value: Call( ExprCall { + range: 143..150, func: Name( ExprName { + range: 143..147, id: Identifier( "type", ), ctx: Load, - range: 143..147, }, ), args: [ Name( ExprName { + range: 148..149, id: Identifier( "e", ), ctx: Load, - range: 148..149, }, ), ], keywords: [], - range: 143..150, }, ), conversion: Int( 0, ), format_spec: None, - range: 133..179, }, ), Constant( ExprConstant { + range: 133..179, value: Str( " with nested ", ), kind: None, - range: 133..179, }, ), FormattedValue( ExprFormattedValue { + range: 133..179, value: Attribute( ExprAttribute { + range: 165..177, value: Name( ExprName { + range: 165..166, id: Identifier( "e", ), ctx: Load, - range: 165..166, }, ), attr: Identifier( "exceptions", ), ctx: Load, - range: 165..177, }, ), conversion: Int( 0, ), format_spec: None, - range: 133..179, }, ), ], - range: 133..179, }, ), ], keywords: [], - range: 127..180, }, ), - range: 127..180, }, ), ], - range: 99..180, }, ), ExceptHandler( ExcepthandlerExceptHandler { + range: 181..260, type_: Some( Name( ExprName { + range: 189..196, id: Identifier( "OSError", ), ctx: Load, - range: 189..196, }, ), ), @@ -307,121 +309,119 @@ expression: parse_ast body: [ Expr( StmtExpr { + range: 207..260, value: Call( ExprCall { + range: 207..260, func: Name( ExprName { + range: 207..212, id: Identifier( "print", ), ctx: Load, - range: 207..212, }, ), args: [ JoinedStr( ExprJoinedStr { + range: 213..259, values: [ Constant( ExprConstant { + range: 213..259, value: Str( "caught ", ), kind: None, - range: 213..259, }, ), FormattedValue( ExprFormattedValue { + range: 213..259, value: Call( ExprCall { + range: 223..230, func: Name( ExprName { + range: 223..227, id: Identifier( "type", ), ctx: Load, - range: 223..227, }, ), args: [ Name( ExprName { + range: 228..229, id: Identifier( "e", ), ctx: Load, - range: 228..229, }, ), ], keywords: [], - range: 223..230, }, ), conversion: Int( 0, ), format_spec: None, - range: 213..259, }, ), Constant( ExprConstant { + range: 213..259, value: Str( " with nested ", ), kind: None, - range: 213..259, }, ), FormattedValue( ExprFormattedValue { + range: 213..259, value: Attribute( ExprAttribute { + range: 245..257, value: Name( ExprName { + range: 245..246, id: Identifier( "e", ), ctx: Load, - range: 245..246, }, ), attr: Identifier( "exceptions", ), ctx: Load, - range: 245..257, }, ), conversion: Int( 0, ), format_spec: None, - range: 213..259, }, ), ], - range: 213..259, }, ), ], keywords: [], - range: 207..260, }, ), - range: 207..260, }, ), ], - range: 181..260, }, ), ], orelse: [], finalbody: [], - range: 0..260, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap b/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap index bbb3aff..ada9492 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap @@ -5,6 +5,7 @@ expression: parse_ast [ FunctionDef( StmtFunctionDef { + range: 1..49, name: Identifier( "args_to_tuple", ), @@ -19,17 +20,17 @@ expression: parse_ast annotation: Some( Starred( ExprStarred { + range: 26..29, value: Name( ExprName { + range: 27..29, id: Identifier( "Ts", ), ctx: Load, - range: 27..29, }, ), ctx: Load, - range: 26..29, }, ), ), @@ -46,14 +47,14 @@ expression: parse_ast body: [ Expr( StmtExpr { + range: 46..49, value: Constant( ExprConstant { + range: 46..49, value: Ellipsis, kind: None, - range: 46..49, }, ), - range: 46..49, }, ), ], @@ -61,37 +62,36 @@ expression: parse_ast returns: Some( Subscript( ExprSubscript { + range: 34..44, value: Name( ExprName { + range: 34..39, id: Identifier( "Tuple", ), ctx: Load, - range: 34..39, }, ), slice: Starred( ExprStarred { + range: 40..43, value: Name( ExprName { + range: 41..43, id: Identifier( "Ts", ), ctx: Load, - range: 41..43, }, ), ctx: Load, - range: 40..43, }, ), ctx: Load, - range: 34..44, }, ), ), type_comment: None, - range: 1..49, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__with_statement.snap b/parser/src/snapshots/rustpython_parser__parser__tests__with_statement.snap index 934dba6..e002667 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__with_statement.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__with_statement.snap @@ -5,15 +5,16 @@ expression: "parse_program(source, \"\").unwrap()" [ With( StmtWith { + range: 0..12, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 5..6, value: Int( 0, ), kind: None, - range: 5..6, }, ), optional_vars: None, @@ -28,30 +29,30 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 0..12, }, ), With( StmtWith { + range: 13..30, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 18..19, value: Int( 0, ), kind: None, - range: 18..19, }, ), optional_vars: Some( Name( ExprName { + range: 23..24, id: Identifier( "x", ), ctx: Store, - range: 23..24, }, ), ), @@ -66,20 +67,20 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 13..30, }, ), With( StmtWith { + range: 31..46, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 36..37, value: Int( 0, ), kind: None, - range: 36..37, }, ), optional_vars: None, @@ -88,11 +89,11 @@ expression: "parse_program(source, \"\").unwrap()" Withitem { context_expr: Constant( ExprConstant { + range: 39..40, value: Int( 1, ), kind: None, - range: 39..40, }, ), optional_vars: None, @@ -107,30 +108,30 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 31..46, }, ), With( StmtWith { + range: 47..72, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 52..53, value: Int( 0, ), kind: None, - range: 52..53, }, ), optional_vars: Some( Name( ExprName { + range: 57..58, id: Identifier( "x", ), ctx: Store, - range: 57..58, }, ), ), @@ -139,21 +140,21 @@ expression: "parse_program(source, \"\").unwrap()" Withitem { context_expr: Constant( ExprConstant { + range: 60..61, value: Int( 1, ), kind: None, - range: 60..61, }, ), optional_vars: Some( Name( ExprName { + range: 65..66, id: Identifier( "y", ), ctx: Store, - range: 65..66, }, ), ), @@ -168,43 +169,43 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 47..72, }, ), With( StmtWith { + range: 73..97, items: [ Withitem { context_expr: IfExp( ExprIfExp { + range: 78..91, test: Constant( ExprConstant { + range: 83..84, value: Int( 1, ), kind: None, - range: 83..84, }, ), body: Constant( ExprConstant { + range: 78..79, value: Int( 0, ), kind: None, - range: 78..79, }, ), orelse: Constant( ExprConstant { + range: 90..91, value: Int( 2, ), kind: None, - range: 90..91, }, ), - range: 78..91, }, ), optional_vars: None, @@ -219,53 +220,53 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 73..97, }, ), With( StmtWith { + range: 98..127, items: [ Withitem { context_expr: IfExp( ExprIfExp { + range: 103..116, test: Constant( ExprConstant { + range: 108..109, value: Int( 1, ), kind: None, - range: 108..109, }, ), body: Constant( ExprConstant { + range: 103..104, value: Int( 0, ), kind: None, - range: 103..104, }, ), orelse: Constant( ExprConstant { + range: 115..116, value: Int( 2, ), kind: None, - range: 115..116, }, ), - range: 103..116, }, ), optional_vars: Some( Name( ExprName { + range: 120..121, id: Identifier( "x", ), ctx: Store, - range: 120..121, }, ), ), @@ -280,18 +281,18 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 98..127, }, ), With( StmtWith { + range: 128..141, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 133..135, elts: [], ctx: Load, - range: 133..135, }, ), optional_vars: None, @@ -306,28 +307,28 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 128..141, }, ), With( StmtWith { + range: 142..160, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 147..149, elts: [], ctx: Load, - range: 147..149, }, ), optional_vars: Some( Name( ExprName { + range: 153..154, id: Identifier( "x", ), ctx: Store, - range: 153..154, }, ), ), @@ -342,20 +343,20 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 142..160, }, ), With( StmtWith { + range: 161..175, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 167..168, value: Int( 0, ), kind: None, - range: 167..168, }, ), optional_vars: None, @@ -370,30 +371,30 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 161..175, }, ), With( StmtWith { + range: 176..195, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 182..183, value: Int( 0, ), kind: None, - range: 182..183, }, ), optional_vars: Some( Name( ExprName { + range: 188..189, id: Identifier( "x", ), ctx: Store, - range: 188..189, }, ), ), @@ -408,20 +409,20 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 176..195, }, ), With( StmtWith { + range: 196..211, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 202..203, value: Int( 0, ), kind: None, - range: 202..203, }, ), optional_vars: None, @@ -436,38 +437,38 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 196..211, }, ), With( StmtWith { + range: 212..232, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 217..221, elts: [ Constant( ExprConstant { + range: 218..219, value: Int( 0, ), kind: None, - range: 218..219, }, ), ], ctx: Load, - range: 217..221, }, ), optional_vars: Some( Name( ExprName { + range: 225..226, id: Identifier( "x", ), ctx: Store, - range: 225..226, }, ), ), @@ -482,20 +483,20 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 212..232, }, ), With( StmtWith { + range: 233..250, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 239..240, value: Int( 0, ), kind: None, - range: 239..240, }, ), optional_vars: None, @@ -504,11 +505,11 @@ expression: "parse_program(source, \"\").unwrap()" Withitem { context_expr: Constant( ExprConstant { + range: 242..243, value: Int( 1, ), kind: None, - range: 242..243, }, ), optional_vars: None, @@ -523,47 +524,47 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 233..250, }, ), With( StmtWith { + range: 251..273, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 256..262, elts: [ Constant( ExprConstant { + range: 257..258, value: Int( 0, ), kind: None, - range: 257..258, }, ), Constant( ExprConstant { + range: 260..261, value: Int( 1, ), kind: None, - range: 260..261, }, ), ], ctx: Load, - range: 256..262, }, ), optional_vars: Some( Name( ExprName { + range: 266..267, id: Identifier( "x", ), ctx: Store, - range: 266..267, }, ), ), @@ -578,34 +579,34 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 251..273, }, ), With( StmtWith { + range: 274..290, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 279..284, elts: [ Starred( ExprStarred { + range: 280..282, value: Name( ExprName { + range: 281..282, id: Identifier( "a", ), ctx: Load, - range: 281..282, }, ), ctx: Load, - range: 280..282, }, ), ], ctx: Load, - range: 279..284, }, ), optional_vars: None, @@ -620,44 +621,44 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 274..290, }, ), With( StmtWith { + range: 291..312, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 296..301, elts: [ Starred( ExprStarred { + range: 297..299, value: Name( ExprName { + range: 298..299, id: Identifier( "a", ), ctx: Load, - range: 298..299, }, ), ctx: Load, - range: 297..299, }, ), ], ctx: Load, - range: 296..301, }, ), optional_vars: Some( Name( ExprName { + range: 305..306, id: Identifier( "x", ), ctx: Store, - range: 305..306, }, ), ), @@ -672,43 +673,43 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 291..312, }, ), With( StmtWith { + range: 313..331, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 318..325, elts: [ Constant( ExprConstant { + range: 319..320, value: Int( 0, ), kind: None, - range: 319..320, }, ), Starred( ExprStarred { + range: 322..324, value: Name( ExprName { + range: 323..324, id: Identifier( "a", ), ctx: Load, - range: 323..324, }, ), ctx: Load, - range: 322..324, }, ), ], ctx: Load, - range: 318..325, }, ), optional_vars: None, @@ -723,53 +724,53 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 313..331, }, ), With( StmtWith { + range: 332..355, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 337..344, elts: [ Constant( ExprConstant { + range: 338..339, value: Int( 0, ), kind: None, - range: 338..339, }, ), Starred( ExprStarred { + range: 341..343, value: Name( ExprName { + range: 342..343, id: Identifier( "a", ), ctx: Load, - range: 342..343, }, ), ctx: Load, - range: 341..343, }, ), ], ctx: Load, - range: 337..344, }, ), optional_vars: Some( Name( ExprName { + range: 348..349, id: Identifier( "x", ), ctx: Store, - range: 348..349, }, ), ), @@ -784,34 +785,34 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 332..355, }, ), With( StmtWith { + range: 356..375, items: [ Withitem { context_expr: NamedExpr( ExprNamedExpr { + range: 362..368, target: Name( ExprName { + range: 362..363, id: Identifier( "a", ), ctx: Store, - range: 362..363, }, ), value: Constant( ExprConstant { + range: 367..368, value: Int( 0, ), kind: None, - range: 367..368, }, ), - range: 362..368, }, ), optional_vars: None, @@ -826,44 +827,44 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 356..375, }, ), With( StmtWith { + range: 376..400, items: [ Withitem { context_expr: NamedExpr( ExprNamedExpr { + range: 382..388, target: Name( ExprName { + range: 382..383, id: Identifier( "a", ), ctx: Store, - range: 382..383, }, ), value: Constant( ExprConstant { + range: 387..388, value: Int( 0, ), kind: None, - range: 387..388, }, ), - range: 382..388, }, ), optional_vars: Some( Name( ExprName { + range: 393..394, id: Identifier( "x", ), ctx: Store, - range: 393..394, }, ), ), @@ -878,65 +879,65 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 376..400, }, ), With( StmtWith { + range: 401..428, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 406..422, elts: [ NamedExpr( ExprNamedExpr { + range: 407..413, target: Name( ExprName { + range: 407..408, id: Identifier( "a", ), ctx: Store, - range: 407..408, }, ), value: Constant( ExprConstant { + range: 412..413, value: Int( 0, ), kind: None, - range: 412..413, }, ), - range: 407..413, }, ), NamedExpr( ExprNamedExpr { + range: 415..421, target: Name( ExprName { + range: 415..416, id: Identifier( "b", ), ctx: Store, - range: 415..416, }, ), value: Constant( ExprConstant { + range: 420..421, value: Int( 1, ), kind: None, - range: 420..421, }, ), - range: 415..421, }, ), ], ctx: Load, - range: 406..422, }, ), optional_vars: None, @@ -951,75 +952,75 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 401..428, }, ), With( StmtWith { + range: 429..461, items: [ Withitem { context_expr: Tuple( ExprTuple { + range: 434..450, elts: [ NamedExpr( ExprNamedExpr { + range: 435..441, target: Name( ExprName { + range: 435..436, id: Identifier( "a", ), ctx: Store, - range: 435..436, }, ), value: Constant( ExprConstant { + range: 440..441, value: Int( 0, ), kind: None, - range: 440..441, }, ), - range: 435..441, }, ), NamedExpr( ExprNamedExpr { + range: 443..449, target: Name( ExprName { + range: 443..444, id: Identifier( "b", ), ctx: Store, - range: 443..444, }, ), value: Constant( ExprConstant { + range: 448..449, value: Int( 1, ), kind: None, - range: 448..449, }, ), - range: 443..449, }, ), ], ctx: Load, - range: 434..450, }, ), optional_vars: Some( Name( ExprName { + range: 454..455, id: Identifier( "x", ), ctx: Store, - range: 454..455, }, ), ), @@ -1034,30 +1035,30 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 429..461, }, ), With( StmtWith { + range: 462..481, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 468..469, value: Int( 0, ), kind: None, - range: 468..469, }, ), optional_vars: Some( Name( ExprName { + range: 473..474, id: Identifier( "a", ), ctx: Store, - range: 473..474, }, ), ), @@ -1072,30 +1073,30 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 462..481, }, ), With( StmtWith { + range: 482..502, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 488..489, value: Int( 0, ), kind: None, - range: 488..489, }, ), optional_vars: Some( Name( ExprName { + range: 493..494, id: Identifier( "a", ), ctx: Store, - range: 493..494, }, ), ), @@ -1110,30 +1111,30 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 482..502, }, ), With( StmtWith { + range: 503..530, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 509..510, value: Int( 0, ), kind: None, - range: 509..510, }, ), optional_vars: Some( Name( ExprName { + range: 514..515, id: Identifier( "a", ), ctx: Store, - range: 514..515, }, ), ), @@ -1142,21 +1143,21 @@ expression: "parse_program(source, \"\").unwrap()" Withitem { context_expr: Constant( ExprConstant { + range: 517..518, value: Int( 1, ), kind: None, - range: 517..518, }, ), optional_vars: Some( Name( ExprName { + range: 522..523, id: Identifier( "b", ), ctx: Store, - range: 522..523, }, ), ), @@ -1171,30 +1172,30 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 503..530, }, ), With( StmtWith { + range: 531..559, items: [ Withitem { context_expr: Constant( ExprConstant { + range: 537..538, value: Int( 0, ), kind: None, - range: 537..538, }, ), optional_vars: Some( Name( ExprName { + range: 542..543, id: Identifier( "a", ), ctx: Store, - range: 542..543, }, ), ), @@ -1203,21 +1204,21 @@ expression: "parse_program(source, \"\").unwrap()" Withitem { context_expr: Constant( ExprConstant { + range: 545..546, value: Int( 1, ), kind: None, - range: 545..546, }, ), optional_vars: Some( Name( ExprName { + range: 550..551, id: Identifier( "b", ), ctx: Store, - range: 550..551, }, ), ), @@ -1232,7 +1233,6 @@ expression: "parse_program(source, \"\").unwrap()" ), ], type_comment: None, - range: 531..559, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__backspace_alias.snap b/parser/src/snapshots/rustpython_parser__string__tests__backspace_alias.snap index 8aedf2b..2b010ef 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__backspace_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__backspace_alias.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..15, value: Constant( ExprConstant { + range: 0..15, value: Str( "\u{8}", ), kind: None, - range: 0..15, }, ), - range: 0..15, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__bell_alias.snap b/parser/src/snapshots/rustpython_parser__string__tests__bell_alias.snap index cf999bb..8ea0075 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__bell_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__bell_alias.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..9, value: Constant( ExprConstant { + range: 0..9, value: Str( "\u{7}", ), kind: None, - range: 0..9, }, ), - range: 0..9, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__carriage_return_alias.snap b/parser/src/snapshots/rustpython_parser__string__tests__carriage_return_alias.snap index d222b08..133911b 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__carriage_return_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__carriage_return_alias.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..21, value: Constant( ExprConstant { + range: 0..21, value: Str( "\r", ), kind: None, - range: 0..21, }, ), - range: 0..21, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__character_tabulation_with_justification_alias.snap b/parser/src/snapshots/rustpython_parser__string__tests__character_tabulation_with_justification_alias.snap index 4e397d7..49d820a 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__character_tabulation_with_justification_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__character_tabulation_with_justification_alias.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..45, value: Constant( ExprConstant { + range: 0..45, value: Str( "\u{89}", ), kind: None, - range: 0..45, }, ), - range: 0..45, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__delete_alias.snap b/parser/src/snapshots/rustpython_parser__string__tests__delete_alias.snap index 630ee19..7aaa024 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__delete_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__delete_alias.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..12, value: Constant( ExprConstant { + range: 0..12, value: Str( "\u{7f}", ), kind: None, - range: 0..12, }, ), - range: 0..12, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__double_quoted_byte.snap b/parser/src/snapshots/rustpython_parser__string__tests__double_quoted_byte.snap index 259901d..79ef9ba 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__double_quoted_byte.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__double_quoted_byte.snap @@ -5,8 +5,10 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..738, value: Constant( ExprConstant { + range: 0..738, value: Bytes( [ 0, @@ -268,10 +270,8 @@ expression: parse_ast ], ), kind: None, - range: 0..738, }, ), - range: 0..738, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__escape_alias.snap b/parser/src/snapshots/rustpython_parser__string__tests__escape_alias.snap index a412117..45ed6b3 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__escape_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__escape_alias.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..12, value: Constant( ExprConstant { + range: 0..12, value: Str( "\u{1b}", ), kind: None, - range: 0..12, }, ), - range: 0..12, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__escape_char_in_byte_literal.snap b/parser/src/snapshots/rustpython_parser__string__tests__escape_char_in_byte_literal.snap index ad2256f..d1898ba 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__escape_char_in_byte_literal.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__escape_char_in_byte_literal.snap @@ -5,8 +5,10 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..13, value: Constant( ExprConstant { + range: 0..13, value: Bytes( [ 111, @@ -22,10 +24,8 @@ expression: parse_ast ], ), kind: None, - range: 0..13, }, ), - range: 0..13, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__escape_octet.snap b/parser/src/snapshots/rustpython_parser__string__tests__escape_octet.snap index f781a0e..dfb9c9a 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__escape_octet.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__escape_octet.snap @@ -5,8 +5,10 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..14, value: Constant( ExprConstant { + range: 0..14, value: Bytes( [ 35, @@ -17,10 +19,8 @@ expression: parse_ast ], ), kind: None, - range: 0..14, }, ), - range: 0..14, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__form_feed_alias.snap b/parser/src/snapshots/rustpython_parser__string__tests__form_feed_alias.snap index 1370eee..9dbbc7f 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__form_feed_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__form_feed_alias.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..15, value: Constant( ExprConstant { + range: 0..15, value: Str( "\u{c}", ), kind: None, - range: 0..15, }, ), - range: 0..15, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_character.snap b/parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_character.snap index 3aec4ad..47f4b47 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_character.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_character.snap @@ -5,41 +5,41 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..8, value: JoinedStr( ExprJoinedStr { + range: 0..8, values: [ Constant( ExprConstant { + range: 0..8, value: Str( "\\", ), kind: None, - range: 0..8, }, ), FormattedValue( ExprFormattedValue { + range: 0..8, value: Name( ExprName { + range: 5..6, id: Identifier( "x", ), ctx: Load, - range: 5..6, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..8, }, ), ], - range: 0..8, }, ), - range: 0..8, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_newline.snap b/parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_newline.snap index ad0c4e4..eb5d75c 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_newline.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_newline.snap @@ -5,41 +5,41 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..8, value: JoinedStr( ExprJoinedStr { + range: 0..8, values: [ Constant( ExprConstant { + range: 0..8, value: Str( "\n", ), kind: None, - range: 0..8, }, ), FormattedValue( ExprFormattedValue { + range: 0..8, value: Name( ExprName { + range: 5..6, id: Identifier( "x", ), ctx: Load, - range: 5..6, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..8, }, ), ], - range: 0..8, }, ), - range: 0..8, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__fstring_line_continuation.snap b/parser/src/snapshots/rustpython_parser__string__tests__fstring_line_continuation.snap index 0017e39..3cae4ff 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__fstring_line_continuation.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__fstring_line_continuation.snap @@ -5,41 +5,41 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..9, value: JoinedStr( ExprJoinedStr { + range: 0..9, values: [ Constant( ExprConstant { + range: 0..9, value: Str( "\\\n", ), kind: None, - range: 0..9, }, ), FormattedValue( ExprFormattedValue { + range: 0..9, value: Name( ExprName { + range: 6..7, id: Identifier( "x", ), ctx: Load, - range: 6..7, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..9, }, ), ], - range: 0..9, }, ), - range: 0..9, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base.snap b/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base.snap index 9cb96fa..40e0bb3 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base.snap @@ -5,38 +5,38 @@ expression: parse_ast [ Constant( ExprConstant { + range: 0..10, value: Str( "user=", ), kind: None, - range: 0..10, }, ), Constant( ExprConstant { + range: 0..10, value: Str( "", ), kind: None, - range: 0..10, }, ), FormattedValue( ExprFormattedValue { + range: 0..10, value: Name( ExprName { + range: 3..7, id: Identifier( "user", ), ctx: Load, - range: 3..7, }, ), conversion: Int( 114, ), format_spec: None, - range: 0..10, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base_more.snap b/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base_more.snap index 1a00128..e08a79d 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base_more.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base_more.snap @@ -5,92 +5,92 @@ expression: parse_ast [ Constant( ExprConstant { + range: 0..38, value: Str( "mix ", ), kind: None, - range: 0..38, }, ), Constant( ExprConstant { + range: 0..38, value: Str( "user=", ), kind: None, - range: 0..38, }, ), Constant( ExprConstant { + range: 0..38, value: Str( "", ), kind: None, - range: 0..38, }, ), FormattedValue( ExprFormattedValue { + range: 0..38, value: Name( ExprName { + range: 7..11, id: Identifier( "user", ), ctx: Load, - range: 7..11, }, ), conversion: Int( 114, ), format_spec: None, - range: 0..38, }, ), Constant( ExprConstant { + range: 0..38, value: Str( " with text and ", ), kind: None, - range: 0..38, }, ), Constant( ExprConstant { + range: 0..38, value: Str( "second=", ), kind: None, - range: 0..38, }, ), Constant( ExprConstant { + range: 0..38, value: Str( "", ), kind: None, - range: 0..38, }, ), FormattedValue( ExprFormattedValue { + range: 0..38, value: Name( ExprName { + range: 29..35, id: Identifier( "second", ), ctx: Load, - range: 29..35, }, ), conversion: Int( 114, ), format_spec: None, - range: 0..38, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_format.snap b/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_format.snap index ec9a7e9..69f27ea 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_format.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_format.snap @@ -5,31 +5,32 @@ expression: parse_ast [ Constant( ExprConstant { + range: 0..14, value: Str( "user=", ), kind: None, - range: 0..14, }, ), Constant( ExprConstant { + range: 0..14, value: Str( "", ), kind: None, - range: 0..14, }, ), FormattedValue( ExprFormattedValue { + range: 0..14, value: Name( ExprName { + range: 3..7, id: Identifier( "user", ), ctx: Load, - range: 3..7, }, ), conversion: Int( @@ -38,22 +39,21 @@ expression: parse_ast format_spec: Some( JoinedStr( ExprJoinedStr { + range: 0..14, values: [ Constant( ExprConstant { + range: 0..14, value: Str( ">10", ), kind: None, - range: 0..14, }, ), ], - range: 0..14, }, ), ), - range: 0..14, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__fstring_unescaped_newline.snap b/parser/src/snapshots/rustpython_parser__string__tests__fstring_unescaped_newline.snap index 63e48da..a1d7b53 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__fstring_unescaped_newline.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__fstring_unescaped_newline.snap @@ -5,41 +5,41 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..11, value: JoinedStr( ExprJoinedStr { + range: 0..11, values: [ Constant( ExprConstant { + range: 0..11, value: Str( "\n", ), kind: None, - range: 0..11, }, ), FormattedValue( ExprFormattedValue { + range: 0..11, value: Name( ExprName { + range: 6..7, id: Identifier( "x", ), ctx: Load, - range: 6..7, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..11, }, ), ], - range: 0..11, }, ), - range: 0..11, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__hts_alias.snap b/parser/src/snapshots/rustpython_parser__string__tests__hts_alias.snap index d3dbd24..bcba919 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__hts_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__hts_alias.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..9, value: Constant( ExprConstant { + range: 0..9, value: Str( "\u{88}", ), kind: None, - range: 0..9, }, ), - range: 0..9, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap index 4c8c280..274823e 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap @@ -5,23 +5,23 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..17, value: JoinedStr( ExprJoinedStr { + range: 0..17, values: [ Constant( ExprConstant { + range: 0..17, value: Str( "Hello world", ), kind: None, - range: 0..17, }, ), ], - range: 0..17, }, ), - range: 0..17, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap index 4c8c280..274823e 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap @@ -5,23 +5,23 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..17, value: JoinedStr( ExprJoinedStr { + range: 0..17, values: [ Constant( ExprConstant { + range: 0..17, value: Str( "Hello world", ), kind: None, - range: 0..17, }, ), ], - range: 0..17, }, ), - range: 0..17, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap index 21dca5f..ee1e801 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap @@ -5,41 +5,41 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..22, value: JoinedStr( ExprJoinedStr { + range: 0..22, values: [ Constant( ExprConstant { + range: 0..22, value: Str( "Hello world", ), kind: None, - range: 0..22, }, ), FormattedValue( ExprFormattedValue { + range: 9..22, value: Constant( ExprConstant { + range: 17..20, value: Str( "!", ), kind: None, - range: 17..20, }, ), conversion: Int( 0, ), format_spec: None, - range: 9..22, }, ), ], - range: 0..22, }, ), - range: 0..22, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring.snap index 61c2181..85064e8 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring.snap @@ -5,47 +5,47 @@ expression: parse_ast [ FormattedValue( ExprFormattedValue { + range: 0..18, value: Name( ExprName { + range: 3..4, id: Identifier( "a", ), ctx: Load, - range: 3..4, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..18, }, ), FormattedValue( ExprFormattedValue { + range: 0..18, value: Name( ExprName { + range: 7..8, id: Identifier( "b", ), ctx: Load, - range: 7..8, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..18, }, ), Constant( ExprConstant { + range: 0..18, value: Str( "{foo}", ), kind: None, - range: 0..18, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_equals.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_equals.snap index d7661bf..ed5516f 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_equals.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_equals.snap @@ -5,15 +5,17 @@ expression: parse_ast [ FormattedValue( ExprFormattedValue { + range: 0..13, value: Compare( ExprCompare { + range: 3..11, left: Constant( ExprConstant { + range: 3..5, value: Int( 42, ), kind: None, - range: 3..5, }, ), ops: [ @@ -22,22 +24,20 @@ expression: parse_ast comparators: [ Constant( ExprConstant { + range: 9..11, value: Int( 42, ), kind: None, - range: 9..11, }, ), ], - range: 3..11, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..13, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_nested_spec.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_nested_spec.snap index 61264fa..723801b 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_nested_spec.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_nested_spec.snap @@ -5,13 +5,14 @@ expression: parse_ast [ FormattedValue( ExprFormattedValue { + range: 0..15, value: Name( ExprName { + range: 3..6, id: Identifier( "foo", ), ctx: Load, - range: 3..6, }, ), conversion: Int( @@ -20,31 +21,30 @@ expression: parse_ast format_spec: Some( JoinedStr( ExprJoinedStr { + range: 0..15, values: [ FormattedValue( ExprFormattedValue { + range: 0..15, value: Name( ExprName { + range: 8..12, id: Identifier( "spec", ), ctx: Load, - range: 8..12, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..15, }, ), ], - range: 0..15, }, ), ), - range: 0..15, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_equals.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_equals.snap index 4b570c0..4a40d0a 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_equals.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_equals.snap @@ -5,15 +5,17 @@ expression: parse_ast [ FormattedValue( ExprFormattedValue { + range: 0..11, value: Compare( ExprCompare { + range: 3..9, left: Constant( ExprConstant { + range: 3..4, value: Int( 1, ), kind: None, - range: 3..4, }, ), ops: [ @@ -22,22 +24,20 @@ expression: parse_ast comparators: [ Constant( ExprConstant { + range: 8..9, value: Int( 2, ), kind: None, - range: 8..9, }, ), ], - range: 3..9, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..11, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_nested_spec.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_nested_spec.snap index fd86cf2..d860d64 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_nested_spec.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_nested_spec.snap @@ -5,13 +5,14 @@ expression: parse_ast [ FormattedValue( ExprFormattedValue { + range: 0..13, value: Name( ExprName { + range: 3..6, id: Identifier( "foo", ), ctx: Load, - range: 3..6, }, ), conversion: Int( @@ -20,22 +21,21 @@ expression: parse_ast format_spec: Some( JoinedStr( ExprJoinedStr { + range: 0..13, values: [ Constant( ExprConstant { + range: 0..13, value: Str( "spec", ), kind: None, - range: 0..13, }, ), ], - range: 0..13, }, ), ), - range: 0..13, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_prec_space.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_prec_space.snap index 20b0fdd..0fb434c 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_prec_space.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_prec_space.snap @@ -5,38 +5,38 @@ expression: parse_ast [ Constant( ExprConstant { + range: 0..10, value: Str( "x =", ), kind: None, - range: 0..10, }, ), Constant( ExprConstant { + range: 0..10, value: Str( "", ), kind: None, - range: 0..10, }, ), FormattedValue( ExprFormattedValue { + range: 0..10, value: Name( ExprName { + range: 3..4, id: Identifier( "x", ), ctx: Load, - range: 3..4, }, ), conversion: Int( 114, ), format_spec: None, - range: 0..10, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_trailing_space.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_trailing_space.snap index 8eb93f1..83daabf 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_trailing_space.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_trailing_space.snap @@ -5,38 +5,38 @@ expression: parse_ast [ Constant( ExprConstant { + range: 0..10, value: Str( "x=", ), kind: None, - range: 0..10, }, ), Constant( ExprConstant { + range: 0..10, value: Str( " ", ), kind: None, - range: 0..10, }, ), FormattedValue( ExprFormattedValue { + range: 0..10, value: Name( ExprName { + range: 3..4, id: Identifier( "x", ), ctx: Load, - range: 3..4, }, ), conversion: Int( 114, ), format_spec: None, - range: 0..10, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_yield_expr.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_yield_expr.snap index 7098bc2..fe7d731 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_yield_expr.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_yield_expr.snap @@ -5,17 +5,17 @@ expression: parse_ast [ FormattedValue( ExprFormattedValue { + range: 0..10, value: Yield( ExprYield { - value: None, range: 3..8, + value: None, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..10, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap index e8803da..6429c7d 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..16, value: Constant( ExprConstant { + range: 0..16, value: Str( "Hello world", ), kind: None, - range: 0..16, }, ), - range: 0..16, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap index ba3bef0..a6b2822 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap @@ -5,18 +5,18 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..20, value: Constant( ExprConstant { + range: 0..20, value: Str( "Hello, world!", ), kind: Some( "u", ), - range: 0..20, }, ), - range: 0..20, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap index 3f40f93..68aacbe 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap @@ -5,25 +5,25 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..18, value: JoinedStr( ExprJoinedStr { + range: 0..18, values: [ Constant( ExprConstant { + range: 0..18, value: Str( "Hello world", ), kind: Some( "u", ), - range: 0..18, }, ), ], - range: 0..18, }, ), - range: 0..18, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap index 9e86d60..c77d509 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap @@ -5,25 +5,25 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..22, value: JoinedStr( ExprJoinedStr { + range: 0..22, values: [ Constant( ExprConstant { + range: 0..22, value: Str( "Hello world!", ), kind: Some( "u", ), - range: 0..22, }, ), ], - range: 0..22, }, ), - range: 0..22, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap index 50cfc85..bd730d8 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap @@ -5,16 +5,16 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..17, value: Constant( ExprConstant { + range: 0..17, value: Str( "Hello world", ), kind: None, - range: 0..17, }, ), - range: 0..17, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap index 9374488..8be8750 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap @@ -5,18 +5,18 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..17, value: Constant( ExprConstant { + range: 0..17, value: Str( "Hello world", ), kind: Some( "u", ), - range: 0..17, }, ), - range: 0..17, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__raw_byte_literal_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__raw_byte_literal_1.snap index bf9dad4..decb6ec 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__raw_byte_literal_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__raw_byte_literal_1.snap @@ -5,8 +5,10 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..8, value: Constant( ExprConstant { + range: 0..8, value: Bytes( [ 92, @@ -16,10 +18,8 @@ expression: parse_ast ], ), kind: None, - range: 0..8, }, ), - range: 0..8, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__raw_byte_literal_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__raw_byte_literal_2.snap index fda9f3a..4972fc0 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__raw_byte_literal_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__raw_byte_literal_2.snap @@ -5,8 +5,10 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..6, value: Constant( ExprConstant { + range: 0..6, value: Bytes( [ 92, @@ -14,10 +16,8 @@ expression: parse_ast ], ), kind: None, - range: 0..6, }, ), - range: 0..6, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__raw_fstring.snap b/parser/src/snapshots/rustpython_parser__string__tests__raw_fstring.snap index 72057a9..9ece93c 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__raw_fstring.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__raw_fstring.snap @@ -5,32 +5,32 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..7, value: JoinedStr( ExprJoinedStr { + range: 0..7, values: [ FormattedValue( ExprFormattedValue { + range: 0..7, value: Name( ExprName { + range: 4..5, id: Identifier( "x", ), ctx: Load, - range: 4..5, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..7, }, ), ], - range: 0..7, }, ), - range: 0..7, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__single_quoted_byte.snap b/parser/src/snapshots/rustpython_parser__string__tests__single_quoted_byte.snap index 259901d..79ef9ba 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__single_quoted_byte.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__single_quoted_byte.snap @@ -5,8 +5,10 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..738, value: Constant( ExprConstant { + range: 0..738, value: Bytes( [ 0, @@ -268,10 +270,8 @@ expression: parse_ast ], ), kind: None, - range: 0..738, }, ), - range: 0..738, }, ), ] diff --git a/parser/src/snapshots/rustpython_parser__string__tests__triple_quoted_raw_fstring.snap b/parser/src/snapshots/rustpython_parser__string__tests__triple_quoted_raw_fstring.snap index 89064bd..7269b46 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__triple_quoted_raw_fstring.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__triple_quoted_raw_fstring.snap @@ -5,32 +5,32 @@ expression: parse_ast [ Expr( StmtExpr { + range: 0..11, value: JoinedStr( ExprJoinedStr { + range: 0..11, values: [ FormattedValue( ExprFormattedValue { + range: 0..11, value: Name( ExprName { + range: 6..7, id: Identifier( "x", ), ctx: Load, - range: 6..7, }, ), conversion: Int( 0, ), format_spec: None, - range: 0..11, }, ), ], - range: 0..11, }, ), - range: 0..11, }, ), ]