From 7e48ec46b9aa3e45ea82efc91c8c4bf2e2a84278 Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Fri, 12 May 2023 19:43:56 +0200 Subject: [PATCH] Cleanup --- ast/Cargo.toml | 1 + ast/asdl_rs.py | 119 +- ast/src/gen/generic.rs | 14 +- ast/src/gen/located.rs | 838 +- ast/src/gen/ranged.rs | 354 +- ast/src/gen/visitor.rs | 8 +- ast/src/impls.rs | 8 +- ast/src/lib.rs | 17 +- ast/src/optimizer.rs | 23 +- ast/src/ranged.rs | 14 +- ast/src/unparse.rs | 18 +- core/src/source_code.rs | 2 +- parser/Cargo.toml | 1 + parser/src/context.rs | 105 +- parser/src/function.rs | 10 +- parser/src/parser.rs | 14 + parser/src/python.lalrpop | 296 +- parser/src/python.rs | 3299 +++--- ...rser__context__tests__ann_assign_name.snap | 68 +- ...ser__context__tests__assign_attribute.snap | 133 +- ...on_parser__context__tests__assign_for.snap | 127 +- ...n_parser__context__tests__assign_list.snap | 156 +- ...ser__context__tests__assign_list_comp.snap | 181 +- ...n_parser__context__tests__assign_name.snap | 114 +- ...er__context__tests__assign_named_expr.snap | 79 +- ...rser__context__tests__assign_set_comp.snap | 181 +- ...arser__context__tests__assign_starred.snap | 171 +- ...ser__context__tests__assign_subscript.snap | 150 +- ..._parser__context__tests__assign_tuple.snap | 156 +- ...n_parser__context__tests__assign_with.snap | 76 +- ..._context__tests__aug_assign_attribute.snap | 129 +- ...rser__context__tests__aug_assign_name.snap | 49 +- ..._context__tests__aug_assign_subscript.snap | 146 +- ...parser__context__tests__del_attribute.snap | 51 +- ...thon_parser__context__tests__del_name.snap | 34 +- ...parser__context__tests__del_subscript.snap | 68 +- ...unction__tests__function_kw_only_args.snap | 113 +- ...__function_kw_only_args_with_defaults.snap | 157 +- ...er__function__tests__function_no_args.snap | 60 +- ..._tests__function_pos_and_kw_only_args.snap | 172 +- ...on_pos_and_kw_only_args_with_defaults.snap | 216 +- ...w_only_args_with_defaults_and_varargs.snap | 237 +- ..._with_defaults_and_varargs_and_kwargs.snap | 258 +- ...r__function__tests__function_pos_args.snap | 113 +- ...ests__function_pos_args_with_defaults.snap | 157 +- ..._function__tests__lambda_kw_only_args.snap | 116 +- ...ts__lambda_kw_only_args_with_defaults.snap | 160 +- ...rser__function__tests__lambda_no_args.snap | 61 +- ...n__tests__lambda_pos_and_kw_only_args.snap | 156 +- ...ser__function__tests__lambda_pos_args.snap | 116 +- ..._tests__lambda_pos_args_with_defaults.snap | 160 +- ...parser__parser__tests__dict_unpacking.snap | 112 +- ..._tests__generator_expression_argument.snap | 351 +- ...stpython_parser__parser__tests__match.snap | 982 +- ...r__parser__tests__match_as_identifier.snap | 1999 ++-- ...ser__parser__tests__parse_bool_op_and.snap | 53 +- ...rser__parser__tests__parse_bool_op_or.snap | 53 +- ...on_parser__parser__tests__parse_class.snap | 265 +- ...rser__tests__parse_dict_comprehension.snap | 87 +- ...ests__parse_double_list_comprehension.snap | 286 +- ...parser__parser__tests__parse_f_string.snap | 49 +- ..._tests__parse_generator_comprehension.snap | 78 +- ...er__parser__tests__parse_if_elif_else.snap | 168 +- ...parse_if_else_generator_comprehension.snap | 131 +- ...n_parser__parser__tests__parse_kwargs.snap | 110 +- ...n_parser__parser__tests__parse_lambda.snap | 133 +- ...rser__tests__parse_list_comprehension.snap | 78 +- ...ed_expression_generator_comprehension.snap | 140 +- ..._parser__parser__tests__parse_print_2.snap | 89 +- ...ser__parser__tests__parse_print_hello.snap | 68 +- ...n_parser__parser__tests__parse_string.snap | 30 +- ...n_parser__parser__tests__parse_tuples.snap | 135 +- ...stpython_parser__parser__tests__patma.snap | 8883 +++++++---------- ...stpython_parser__parser__tests__slice.snap | 116 +- ...hon_parser__parser__tests__star_index.snap | 619 +- ...rustpython_parser__parser__tests__try.snap | 531 +- ...ython_parser__parser__tests__try_star.snap | 936 +- ...ser__parser__tests__variadic_generics.snap | 196 +- ...parser__parser__tests__with_statement.snap | 2594 ++--- ...arser__string__tests__backspace_alias.snap | 30 +- ...hon_parser__string__tests__bell_alias.snap | 30 +- ..._string__tests__carriage_return_alias.snap | 30 +- ...r_tabulation_with_justification_alias.snap | 30 +- ...n_parser__string__tests__delete_alias.snap | 30 +- ...er__string__tests__double_quoted_byte.snap | 544 +- ...n_parser__string__tests__escape_alias.snap | 30 +- ...g__tests__escape_char_in_byte_literal.snap | 52 +- ...n_parser__string__tests__escape_octet.snap | 42 +- ...arser__string__tests__form_feed_alias.snap | 30 +- ...ing__tests__fstring_escaped_character.snap | 91 +- ...tring__tests__fstring_escaped_newline.snap | 91 +- ...ing__tests__fstring_line_continuation.snap | 91 +- ...__fstring_parse_self_documenting_base.snap | 80 +- ...ring_parse_self_documenting_base_more.snap | 202 +- ...fstring_parse_self_documenting_format.snap | 116 +- ...ing__tests__fstring_unescaped_newline.snap | 91 +- ...thon_parser__string__tests__hts_alias.snap | 30 +- ...tring__tests__parse_f_string_concat_1.snap | 49 +- ...tring__tests__parse_f_string_concat_2.snap | 49 +- ...tring__tests__parse_f_string_concat_3.snap | 91 +- ..._parser__string__tests__parse_fstring.snap | 97 +- ...__string__tests__parse_fstring_equals.snap | 80 +- ...ing__tests__parse_fstring_nested_spec.snap | 95 +- ...ring__tests__parse_fstring_not_equals.snap | 80 +- ..._tests__parse_fstring_not_nested_spec.snap | 74 +- ...ts__parse_fstring_self_doc_prec_space.snap | 80 +- ...parse_fstring_self_doc_trailing_space.snap | 80 +- ...ring__tests__parse_fstring_yield_expr.snap | 34 +- ...r__string__tests__parse_string_concat.snap | 30 +- ..._parse_string_triple_quotes_with_kind.snap | 34 +- ...ing__tests__parse_u_f_string_concat_1.snap | 53 +- ...ing__tests__parse_u_f_string_concat_2.snap | 53 +- ...tring__tests__parse_u_string_concat_1.snap | 30 +- ...tring__tests__parse_u_string_concat_2.snap | 34 +- ...er__string__tests__raw_byte_literal_1.snap | 40 +- ...er__string__tests__raw_byte_literal_2.snap | 36 +- ...on_parser__string__tests__raw_fstring.snap | 70 +- ...er__string__tests__single_quoted_byte.snap | 544 +- ...ing__tests__triple_quoted_raw_fstring.snap | 70 +- parser/src/string.rs | 34 +- 120 files changed, 14151 insertions(+), 18060 deletions(-) diff --git a/ast/Cargo.toml b/ast/Cargo.toml index e72c150..77fafd0 100644 --- a/ast/Cargo.toml +++ b/ast/Cargo.toml @@ -14,6 +14,7 @@ location = ["fold", "rustpython-parser-core/location"] fold = [] unparse = ["rustpython-literal"] visitor = [] +more-attributes = [] [dependencies] rustpython-parser-core = { workspace = true } diff --git a/ast/asdl_rs.py b/ast/asdl_rs.py index dc4f806..90e0752 100755 --- a/ast/asdl_rs.py +++ b/ast/asdl_rs.py @@ -387,7 +387,7 @@ class StructVisitor(EmitVisitor): product_name = rust_type_name(name) self.emit_attrs(depth) - self.emit(f"pub struct {product_name} {{", depth) + self.emit(f"pub struct {product_name} {{", depth) for f in product.fields: self.visit(f, type_info, "pub ", depth + 1) assert bool(product.attributes) == type_info.no_cfg(self.type_info) @@ -657,7 +657,7 @@ class VisitorTraitDefVisitor(StructVisitor): self.emit_visitor(name, depth) self.emit_generic_visitor_signature(name, depth) depth += 1 - self.emit("match node.node {", depth) + self.emit("match node {", depth) for t in sum.types: self.visit_match_for_type(name, enum_name, t, depth + 1) self.emit("}", depth) @@ -925,7 +925,6 @@ class TraitImplVisitor(EmitVisitor): return f"Node::ast_from_object(_vm, get_node_field(_vm, &_object, {name}, {json.dumps(typename)})?)?" - class RangedDefVisitor(EmitVisitor): def visitModule(self, mod): for dfn in mod.dfns: @@ -937,41 +936,73 @@ class RangedDefVisitor(EmitVisitor): def visitSum(self, sum, name, depth): info = self.type_info[name] - # if info.is_simple: - # return + if info.is_simple: + return - if not info.no_cfg(self.type_info): - self.emit('#[cfg(feature = "more-attributes")]', 0) - - self.emit( - f""" - impl Ranged for crate::generic::{info.rust_sum_name}:: {{ - fn range(&self) -> TextRange {{ - self.range - }} - }} - """, 0) + for ty in sum.types: + info = self.type_info[ty.name] + self.make_ranged_impl(info) def visitProduct(self, product, name, depth): info = self.type_info[name] - # if info.is_simple: - # return + self.make_ranged_impl(info) + + def make_ranged_impl(self, info): + if not info.no_cfg(self.type_info): + self.emit('#[cfg(feature = "more-attributes")]', 0) + + self.file.write( + f""" + impl Ranged for crate::generic::{info.rust_sum_name}:: {{ + fn range(&self) -> TextRange {{ + self.range + }} + }} + """.strip() + ) + +class LocatedDefVisitor(EmitVisitor): + def visitModule(self, mod): + for dfn in mod.dfns: + self.visit(dfn) + + def visitType(self, type, depth=0): + self.visit(type.value, type.name, depth) + + def visitSum(self, sum, name, depth): + info = self.type_info[name] + + if info.is_simple: + return + + for ty in sum.types: + info = self.type_info[ty.name] + self.make_located_impl(info) + + def visitProduct(self, product, name, depth): + info = self.type_info[name] + + self.make_located_impl(info) + + def make_located_impl(self, info): + if not info.no_cfg(self.type_info): + self.emit('#[cfg(feature = "more-attributes")]', 0) + + self.emit(f"pub type {info.rust_sum_name} = crate::generic::{info.rust_sum_name}::;", 0) if not info.no_cfg(self.type_info): self.emit('#[cfg(feature = "more-attributes")]', 0) - self.emit( + self.file.write( f""" - impl Ranged for crate::generic::{info.rust_sum_name}:: {{ - fn range(&self) -> TextRange {{ - self.range - }} - }} - """, 0) - - for f in product.fields: - self.visit(f, info, "pub ", depth + 1) + impl Located for {info.rust_sum_name} {{ + fn range(&self) -> SourceRange {{ + self.range + }} + }} + """.strip() + ) class ChainOfVisitors: def __init__(self, *visitors): @@ -997,40 +1028,12 @@ def write_visitor_def(mod, type_info, f): def write_ranged_def(mod, type_info, f): + f.write("use crate::Ranged;") RangedDefVisitor(f, type_info).visit(mod) -# def write_ranged_def(mod, type_info, f): -# import pprint -# for info in type_info.values(): -# pprint.pp(info.__dict__) -# if not info.is_simple and not info.product: -# if not info.no_cfg(type_info): -# f.write('#[cfg(feature = "more-attributes")]') -# f.write( -# f""" -# impl Ranged for crate::generic::{info.rust_sum_name}:: {{ -# fn range(&self) -> TextRange {{ -# self.range -# }} -# }} -# """ -# ) def write_located_def(mod, type_info, f): - for info in type_info.values(): - if not info.is_simple: - if not info.no_cfg(type_info): - f.write('#[cfg(feature = "more-attributes")]') - f.write( - f""" - impl Located for crate::generic::{info.rust_sum_name}:: {{ - fn range(&self) -> SourceRange {{ - self.range - }} - }} - """ - ) - + LocatedDefVisitor(f, type_info).visit(mod) def write_ast_mod(mod, type_info, f): f.write( diff --git a/ast/src/gen/generic.rs b/ast/src/gen/generic.rs index 03a2be6..48126b8 100644 --- a/ast/src/gen/generic.rs +++ b/ast/src/gen/generic.rs @@ -964,7 +964,7 @@ pub enum Cmpop { } #[derive(Clone, Debug, PartialEq)] -pub struct Comprehension { +pub struct Comprehension { pub target: Expr, pub iter: Expr, pub ifs: Vec>, @@ -995,7 +995,7 @@ pub enum Excepthandler { } #[derive(Clone, Debug, PartialEq)] -pub struct Arguments { +pub struct Arguments { pub posonlyargs: Vec>, pub args: Vec>, pub vararg: Option>>, @@ -1010,7 +1010,7 @@ pub struct Arguments { } #[derive(Clone, Debug, PartialEq)] -pub struct Arg { +pub struct Arg { pub arg: Identifier, pub annotation: Option>>, pub type_comment: Option, @@ -1018,21 +1018,21 @@ pub struct Arg { } #[derive(Clone, Debug, PartialEq)] -pub struct Keyword { +pub struct Keyword { pub arg: Option, pub value: Expr, pub range: R, } #[derive(Clone, Debug, PartialEq)] -pub struct Alias { +pub struct Alias { pub name: Identifier, pub asname: Option, pub range: R, } #[derive(Clone, Debug, PartialEq)] -pub struct Withitem { +pub struct Withitem { pub context_expr: Expr, pub optional_vars: Option>>, #[cfg(feature = "more-attributes")] @@ -1042,7 +1042,7 @@ pub struct Withitem { } #[derive(Clone, Debug, PartialEq)] -pub struct MatchCase { +pub struct MatchCase { pub pattern: Pattern, pub guard: Option>>, pub body: Vec>, diff --git a/ast/src/gen/located.rs b/ast/src/gen/located.rs index 93bbf56..8b124dd 100644 --- a/ast/src/gen/located.rs +++ b/ast/src/gen/located.rs @@ -1,487 +1,469 @@ // File automatically generated by ast/asdl_rs.py. #[cfg(feature = "more-attributes")] -impl Located for crate::generic::Mod { +pub type ModModule = crate::generic::ModModule; +#[cfg(feature = "more-attributes")] +impl Located for ModModule { fn range(&self) -> SourceRange { self.range } } #[cfg(feature = "more-attributes")] -impl Located for crate::generic::ModModule { +pub type ModInteractive = crate::generic::ModInteractive; +#[cfg(feature = "more-attributes")] +impl Located for ModInteractive { fn range(&self) -> SourceRange { self.range } } #[cfg(feature = "more-attributes")] -impl Located for crate::generic::ModInteractive { +pub type ModExpression = crate::generic::ModExpression; +#[cfg(feature = "more-attributes")] +impl Located for ModExpression { fn range(&self) -> SourceRange { self.range } } #[cfg(feature = "more-attributes")] -impl Located for crate::generic::ModExpression { +pub type ModFunctionType = crate::generic::ModFunctionType; +#[cfg(feature = "more-attributes")] +impl Located for ModFunctionType { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtFunctionDef = crate::generic::StmtFunctionDef; +impl Located for StmtFunctionDef { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtAsyncFunctionDef = crate::generic::StmtAsyncFunctionDef; +impl Located for StmtAsyncFunctionDef { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtClassDef = crate::generic::StmtClassDef; +impl Located for StmtClassDef { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtReturn = crate::generic::StmtReturn; +impl Located for StmtReturn { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtDelete = crate::generic::StmtDelete; +impl Located for StmtDelete { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtAssign = crate::generic::StmtAssign; +impl Located for StmtAssign { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtAugAssign = crate::generic::StmtAugAssign; +impl Located for StmtAugAssign { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtAnnAssign = crate::generic::StmtAnnAssign; +impl Located for StmtAnnAssign { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtFor = crate::generic::StmtFor; +impl Located for StmtFor { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtAsyncFor = crate::generic::StmtAsyncFor; +impl Located for StmtAsyncFor { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtWhile = crate::generic::StmtWhile; +impl Located for StmtWhile { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtIf = crate::generic::StmtIf; +impl Located for StmtIf { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtWith = crate::generic::StmtWith; +impl Located for StmtWith { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtAsyncWith = crate::generic::StmtAsyncWith; +impl Located for StmtAsyncWith { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtMatch = crate::generic::StmtMatch; +impl Located for StmtMatch { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtRaise = crate::generic::StmtRaise; +impl Located for StmtRaise { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtTry = crate::generic::StmtTry; +impl Located for StmtTry { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtTryStar = crate::generic::StmtTryStar; +impl Located for StmtTryStar { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtAssert = crate::generic::StmtAssert; +impl Located for StmtAssert { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtImport = crate::generic::StmtImport; +impl Located for StmtImport { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtImportFrom = crate::generic::StmtImportFrom; +impl Located for StmtImportFrom { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtGlobal = crate::generic::StmtGlobal; +impl Located for StmtGlobal { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtNonlocal = crate::generic::StmtNonlocal; +impl Located for StmtNonlocal { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtExpr = crate::generic::StmtExpr; +impl Located for StmtExpr { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtPass = crate::generic::StmtPass; +impl Located for StmtPass { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtBreak = crate::generic::StmtBreak; +impl Located for StmtBreak { + fn range(&self) -> SourceRange { + self.range + } +} +pub type StmtContinue = crate::generic::StmtContinue; +impl Located for StmtContinue { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprBoolOp = crate::generic::ExprBoolOp; +impl Located for ExprBoolOp { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprNamedExpr = crate::generic::ExprNamedExpr; +impl Located for ExprNamedExpr { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprBinOp = crate::generic::ExprBinOp; +impl Located for ExprBinOp { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprUnaryOp = crate::generic::ExprUnaryOp; +impl Located for ExprUnaryOp { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprLambda = crate::generic::ExprLambda; +impl Located for ExprLambda { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprIfExp = crate::generic::ExprIfExp; +impl Located for ExprIfExp { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprDict = crate::generic::ExprDict; +impl Located for ExprDict { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprSet = crate::generic::ExprSet; +impl Located for ExprSet { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprListComp = crate::generic::ExprListComp; +impl Located for ExprListComp { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprSetComp = crate::generic::ExprSetComp; +impl Located for ExprSetComp { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprDictComp = crate::generic::ExprDictComp; +impl Located for ExprDictComp { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprGeneratorExp = crate::generic::ExprGeneratorExp; +impl Located for ExprGeneratorExp { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprAwait = crate::generic::ExprAwait; +impl Located for ExprAwait { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprYield = crate::generic::ExprYield; +impl Located for ExprYield { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprYieldFrom = crate::generic::ExprYieldFrom; +impl Located for ExprYieldFrom { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprCompare = crate::generic::ExprCompare; +impl Located for ExprCompare { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprCall = crate::generic::ExprCall; +impl Located for ExprCall { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprFormattedValue = crate::generic::ExprFormattedValue; +impl Located for ExprFormattedValue { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprJoinedStr = crate::generic::ExprJoinedStr; +impl Located for ExprJoinedStr { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprConstant = crate::generic::ExprConstant; +impl Located for ExprConstant { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprAttribute = crate::generic::ExprAttribute; +impl Located for ExprAttribute { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprSubscript = crate::generic::ExprSubscript; +impl Located for ExprSubscript { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprStarred = crate::generic::ExprStarred; +impl Located for ExprStarred { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprName = crate::generic::ExprName; +impl Located for ExprName { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprList = crate::generic::ExprList; +impl Located for ExprList { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprTuple = crate::generic::ExprTuple; +impl Located for ExprTuple { + fn range(&self) -> SourceRange { + self.range + } +} +pub type ExprSlice = crate::generic::ExprSlice; +impl Located for ExprSlice { fn range(&self) -> SourceRange { self.range } } #[cfg(feature = "more-attributes")] -impl Located for crate::generic::ModFunctionType { +pub type Comprehension = crate::generic::Comprehension; +#[cfg(feature = "more-attributes")] +impl Located for Comprehension { fn range(&self) -> SourceRange { self.range } } - -impl Located for crate::generic::Stmt { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtFunctionDef { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtAsyncFunctionDef { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtClassDef { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtReturn { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtDelete { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtAssign { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtAugAssign { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtAnnAssign { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtFor { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtAsyncFor { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtWhile { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtIf { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtWith { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtAsyncWith { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtMatch { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtRaise { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtTry { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtTryStar { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtAssert { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtImport { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtImportFrom { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtGlobal { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtNonlocal { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtExpr { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtPass { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtBreak { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::StmtContinue { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::Expr { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprBoolOp { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprNamedExpr { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprBinOp { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprUnaryOp { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprLambda { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprIfExp { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprDict { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprSet { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprListComp { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprSetComp { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprDictComp { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprGeneratorExp { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprAwait { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprYield { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprYieldFrom { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprCompare { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprCall { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprFormattedValue { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprJoinedStr { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprConstant { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprAttribute { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprSubscript { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprStarred { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprName { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprList { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprTuple { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::ExprSlice { +pub type ExcepthandlerExceptHandler = crate::generic::ExcepthandlerExceptHandler; +impl Located for ExcepthandlerExceptHandler { fn range(&self) -> SourceRange { self.range } } #[cfg(feature = "more-attributes")] -impl Located for crate::generic::Comprehension { +pub type Arguments = crate::generic::Arguments; +#[cfg(feature = "more-attributes")] +impl Located for Arguments { fn range(&self) -> SourceRange { self.range } } - -impl Located for crate::generic::Excepthandler { +pub type Arg = crate::generic::Arg; +impl Located for Arg { fn range(&self) -> SourceRange { self.range } } - -impl Located for crate::generic::ExcepthandlerExceptHandler { +pub type Keyword = crate::generic::Keyword; +impl Located for Keyword { + fn range(&self) -> SourceRange { + self.range + } +} +pub type Alias = crate::generic::Alias; +impl Located for Alias { fn range(&self) -> SourceRange { self.range } } #[cfg(feature = "more-attributes")] -impl Located for crate::generic::Arguments { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::Arg { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::Keyword { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::Alias { +pub type Withitem = crate::generic::Withitem; +#[cfg(feature = "more-attributes")] +impl Located for Withitem { fn range(&self) -> SourceRange { self.range } } #[cfg(feature = "more-attributes")] -impl Located for crate::generic::Withitem { +pub type MatchCase = crate::generic::MatchCase; +#[cfg(feature = "more-attributes")] +impl Located for MatchCase { + fn range(&self) -> SourceRange { + self.range + } +} +pub type PatternMatchValue = crate::generic::PatternMatchValue; +impl Located for PatternMatchValue { + fn range(&self) -> SourceRange { + self.range + } +} +pub type PatternMatchSingleton = crate::generic::PatternMatchSingleton; +impl Located for PatternMatchSingleton { + fn range(&self) -> SourceRange { + self.range + } +} +pub type PatternMatchSequence = crate::generic::PatternMatchSequence; +impl Located for PatternMatchSequence { + fn range(&self) -> SourceRange { + self.range + } +} +pub type PatternMatchMapping = crate::generic::PatternMatchMapping; +impl Located for PatternMatchMapping { + fn range(&self) -> SourceRange { + self.range + } +} +pub type PatternMatchClass = crate::generic::PatternMatchClass; +impl Located for PatternMatchClass { + fn range(&self) -> SourceRange { + self.range + } +} +pub type PatternMatchStar = crate::generic::PatternMatchStar; +impl Located for PatternMatchStar { + fn range(&self) -> SourceRange { + self.range + } +} +pub type PatternMatchAs = crate::generic::PatternMatchAs; +impl Located for PatternMatchAs { + fn range(&self) -> SourceRange { + self.range + } +} +pub type PatternMatchOr = crate::generic::PatternMatchOr; +impl Located for PatternMatchOr { fn range(&self) -> SourceRange { self.range } } #[cfg(feature = "more-attributes")] -impl Located for crate::generic::MatchCase { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::Pattern { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::PatternMatchValue { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::PatternMatchSingleton { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::PatternMatchSequence { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::PatternMatchMapping { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::PatternMatchClass { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::PatternMatchStar { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::PatternMatchAs { - fn range(&self) -> SourceRange { - self.range - } -} - -impl Located for crate::generic::PatternMatchOr { - fn range(&self) -> SourceRange { - self.range - } -} +pub type TypeIgnoreTypeIgnore = crate::generic::TypeIgnoreTypeIgnore; #[cfg(feature = "more-attributes")] -impl Located for crate::generic::TypeIgnore { - fn range(&self) -> SourceRange { - self.range - } -} -#[cfg(feature = "more-attributes")] -impl Located for crate::generic::TypeIgnoreTypeIgnore { +impl Located for TypeIgnoreTypeIgnore { fn range(&self) -> SourceRange { self.range } diff --git a/ast/src/gen/ranged.rs b/ast/src/gen/ranged.rs index 990662f..3d948a6 100644 --- a/ast/src/gen/ranged.rs +++ b/ast/src/gen/ranged.rs @@ -1,130 +1,386 @@ // File automatically generated by ast/asdl_rs.py. +use crate::Ranged; #[cfg(feature = "more-attributes")] - -impl Ranged for crate::generic::Mod { +impl Ranged for crate::generic::ModModule { fn range(&self) -> TextRange { self.range } } - -impl Ranged for crate::generic::Stmt { - fn range(&self) -> TextRange { - self.range - } -} - -impl Ranged for crate::generic::Expr { - fn range(&self) -> TextRange { - self.range - } -} - #[cfg(feature = "more-attributes")] - -impl Ranged for crate::generic::ExprContext { +impl Ranged for crate::generic::ModInteractive { fn range(&self) -> TextRange { self.range } } - #[cfg(feature = "more-attributes")] - -impl Ranged for crate::generic::Boolop { +impl Ranged for crate::generic::ModExpression { fn range(&self) -> TextRange { self.range } } - #[cfg(feature = "more-attributes")] - -impl Ranged for crate::generic::Operator { +impl Ranged for crate::generic::ModFunctionType { fn range(&self) -> TextRange { self.range } } - -#[cfg(feature = "more-attributes")] - -impl Ranged for crate::generic::Unaryop { +impl Ranged for crate::generic::StmtFunctionDef { fn range(&self) -> TextRange { self.range } } - -#[cfg(feature = "more-attributes")] - -impl Ranged for crate::generic::Cmpop { +impl Ranged for crate::generic::StmtAsyncFunctionDef { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtClassDef { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtReturn { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtDelete { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtAssign { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtAugAssign { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtAnnAssign { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtFor { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtAsyncFor { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtWhile { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtIf { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtWith { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtAsyncWith { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtMatch { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtRaise { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtTry { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtTryStar { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtAssert { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtImport { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtImportFrom { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtGlobal { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtNonlocal { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtExpr { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtPass { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtBreak { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::StmtContinue { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprBoolOp { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprNamedExpr { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprBinOp { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprUnaryOp { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprLambda { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprIfExp { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprDict { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprSet { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprListComp { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprSetComp { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprDictComp { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprGeneratorExp { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprAwait { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprYield { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprYieldFrom { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprCompare { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprCall { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprFormattedValue { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprJoinedStr { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprConstant { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprAttribute { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprSubscript { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprStarred { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprName { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprList { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprTuple { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::ExprSlice { fn range(&self) -> TextRange { self.range } } - #[cfg(feature = "more-attributes")] - impl Ranged for crate::generic::Comprehension { fn range(&self) -> TextRange { self.range } } - -impl Ranged for crate::generic::Excepthandler { +impl Ranged for crate::generic::ExcepthandlerExceptHandler { fn range(&self) -> TextRange { self.range } } - #[cfg(feature = "more-attributes")] - impl Ranged for crate::generic::Arguments { fn range(&self) -> TextRange { self.range } } - impl Ranged for crate::generic::Arg { fn range(&self) -> TextRange { self.range } } - impl Ranged for crate::generic::Keyword { fn range(&self) -> TextRange { self.range } } - impl Ranged for crate::generic::Alias { fn range(&self) -> TextRange { self.range } } - #[cfg(feature = "more-attributes")] - impl Ranged for crate::generic::Withitem { fn range(&self) -> TextRange { self.range } } - #[cfg(feature = "more-attributes")] - impl Ranged for crate::generic::MatchCase { fn range(&self) -> TextRange { self.range } } - -impl Ranged for crate::generic::Pattern { +impl Ranged for crate::generic::PatternMatchValue { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::PatternMatchSingleton { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::PatternMatchSequence { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::PatternMatchMapping { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::PatternMatchClass { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::PatternMatchStar { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::PatternMatchAs { + fn range(&self) -> TextRange { + self.range + } +} +impl Ranged for crate::generic::PatternMatchOr { fn range(&self) -> TextRange { self.range } } - #[cfg(feature = "more-attributes")] - -impl Ranged for crate::generic::TypeIgnore { +impl Ranged for crate::generic::TypeIgnoreTypeIgnore { fn range(&self) -> TextRange { self.range } diff --git a/ast/src/gen/visitor.rs b/ast/src/gen/visitor.rs index e949b03..0cb020c 100644 --- a/ast/src/gen/visitor.rs +++ b/ast/src/gen/visitor.rs @@ -6,7 +6,7 @@ pub trait Visitor { self.generic_visit_stmt(node) } fn generic_visit_stmt(&mut self, node: Stmt) { - match node.node { + match node { Stmt::FunctionDef(data) => self.visit_stmt_FunctionDef(data), Stmt::AsyncFunctionDef(data) => self.visit_stmt_AsyncFunctionDef(data), Stmt::ClassDef(data) => self.visit_stmt_ClassDef(data), @@ -345,7 +345,7 @@ pub trait Visitor { self.generic_visit_expr(node) } fn generic_visit_expr(&mut self, node: Expr) { - match node.node { + match node { Expr::BoolOp(data) => self.visit_expr_BoolOp(data), Expr::NamedExpr(data) => self.visit_expr_NamedExpr(data), Expr::BinOp(data) => self.visit_expr_BinOp(data), @@ -689,7 +689,7 @@ pub trait Visitor { self.generic_visit_excepthandler(node) } fn generic_visit_excepthandler(&mut self, node: Excepthandler) { - match node.node { + match node { Excepthandler::ExceptHandler(data) => self.visit_excepthandler_ExceptHandler(data), } } @@ -732,7 +732,7 @@ pub trait Visitor { self.generic_visit_pattern(node) } fn generic_visit_pattern(&mut self, node: Pattern) { - match node.node { + match node { Pattern::MatchValue(data) => self.visit_pattern_MatchValue(data), Pattern::MatchSingleton(data) => self.visit_pattern_MatchSingleton(data), Pattern::MatchSequence(data) => self.visit_pattern_MatchSequence(data), diff --git a/ast/src/impls.rs b/ast/src/impls.rs index 99a0f0b..f06d336 100644 --- a/ast/src/impls.rs +++ b/ast/src/impls.rs @@ -1,6 +1,5 @@ -use crate::ranged::Ranged; use crate::text_size::TextRange; -use crate::{Constant, Excepthandler, Expr, Pattern, Stmt}; +use crate::{Constant, Excepthandler, Expr, Pattern, Ranged, Stmt}; impl Expr { /// Returns a short name for the node suitable for use in error messages. @@ -41,10 +40,7 @@ impl Expr { Expr::Starred { .. } => "starred", Expr::Slice { .. } => "slice", Expr::JoinedStr(crate::ExprJoinedStr { values, .. }) => { - if values - .iter() - .any(|e| matches!(e.node, Expr::JoinedStr { .. })) - { + if values.iter().any(|e| e.is_joined_str_expr()) { "f-string expression" } else { "literal" diff --git a/ast/src/lib.rs b/ast/src/lib.rs index f538a3b..de510fb 100644 --- a/ast/src/lib.rs +++ b/ast/src/lib.rs @@ -1,7 +1,7 @@ mod builtin; #[cfg(feature = "fold")] mod fold_helpers; -pub mod generic { +mod generic { #![allow(clippy::derive_partial_eq_without_eq)] pub use crate::builtin::*; @@ -18,7 +18,7 @@ pub use builtin::*; pub use generic::*; pub use rustpython_parser_core::{text_size, ConversionFlag}; -pub type Suite = Vec>; +pub type Suite = Vec>; #[cfg(feature = "fold")] pub mod fold { @@ -41,8 +41,21 @@ pub use rustpython_parser_core::source_code; #[cfg(feature = "visitor")] pub use visitor::Visitor; +pub trait Ranged { + fn range(&self) -> TextRange; + + fn start(&self) -> TextSize { + self.range().start() + } + + fn end(&self) -> TextSize { + self.range().end() + } +} + #[cfg(feature = "constant-optimization")] mod optimizer; #[cfg(feature = "constant-optimization")] pub use optimizer::ConstantOptimizer; +use rustpython_parser_core::text_size::{TextRange, TextSize}; diff --git a/ast/src/optimizer.rs b/ast/src/optimizer.rs index ad4abbc..4013a0f 100644 --- a/ast/src/optimizer.rs +++ b/ast/src/optimizer.rs @@ -20,19 +20,16 @@ impl crate::fold::Fold for ConstantOptimizer { Ok(user) } fn fold_expr(&mut self, node: crate::Expr) -> Result, Self::Error> { - match node.node { + match node { crate::Expr::Tuple(crate::ExprTuple { elts, ctx, range }) => { let elts = elts .into_iter() .map(|x| self.fold_expr(x)) .collect::, _>>()?; - let expr = if elts - .iter() - .all(|e| matches!(e.node, crate::Expr::Constant { .. })) - { + let expr = if elts.iter().all(|e| e.is_constant_expr()) { let tuple = elts .into_iter() - .map(|e| match e.node { + .map(|e| match e { crate::Expr::Constant(crate::ExprConstant { value, .. }) => value, _ => unreachable!(), }) @@ -55,7 +52,6 @@ impl crate::fold::Fold for ConstantOptimizer { #[cfg(test)] mod tests { use num_bigint::BigInt; - use rustpython_parser_core::text_size::TextRange; #[cfg(feature = "constant-optimization")] #[test] @@ -63,8 +59,6 @@ mod tests { use crate::{fold::Fold, *}; let range = TextRange::default(); - #[allow(clippy::let_unit_value)] - let custom = (); let ast = ExprTuple { ctx: ExprContext::Load, elts: vec![ @@ -72,12 +66,14 @@ mod tests { value: BigInt::from(1).into(), kind: None, range, - }, + } + .into(), ExprConstant { value: BigInt::from(2).into(), kind: None, range, - }, + } + .into(), ExprTuple { ctx: ExprContext::Load, elts: vec![ @@ -101,12 +97,13 @@ mod tests { .into(), ], range, - }, + } + .into(), ], range, }; let new_ast = ConstantOptimizer::new() - .fold_expr(ast) + .fold_expr(ast.into()) .unwrap_or_else(|e| match e {}); assert_eq!( new_ast, diff --git a/ast/src/ranged.rs b/ast/src/ranged.rs index 53cbc43..3f49a5e 100644 --- a/ast/src/ranged.rs +++ b/ast/src/ranged.rs @@ -1,16 +1,4 @@ -use crate::text_size::{TextRange, TextSize}; - -pub trait Ranged { - fn range(&self) -> TextRange; - - fn start(&self) -> TextSize { - self.range().start() - } - - fn end(&self) -> TextSize { - self.range().end() - } -} +use crate::text_size::TextRange; pub use crate::builtin::*; include!("gen/ranged.rs"); diff --git a/ast/src/unparse.rs b/ast/src/unparse.rs index 6db66f1..4d984a1 100644 --- a/ast/src/unparse.rs +++ b/ast/src/unparse.rs @@ -71,7 +71,7 @@ impl<'a> Unparser<'a> { ret }}; } - match &ast.node { + match &ast { Expr::BoolOp(crate::ExprBoolOp { op, values, @@ -330,13 +330,13 @@ impl<'a> Unparser<'a> { } for kw in keywords { self.p_delim(&mut first, ", ")?; - if let Some(arg) = &kw.node.arg { + if let Some(arg) = &kw.arg { self.p_id(arg)?; self.p("=")?; } else { self.p("**")?; } - self.unparse_expr(&kw.node.value, precedence::TEST)?; + self.unparse_expr(&kw.value, precedence::TEST)?; } } self.p(")")?; @@ -376,7 +376,7 @@ impl<'a> Unparser<'a> { let period = if let Expr::Constant(crate::ExprConstant { value: Constant::Int(_), .. - }) = &value.node + }) = value.as_ref() { " ." } else { @@ -388,10 +388,10 @@ impl<'a> Unparser<'a> { Expr::Subscript(crate::ExprSubscript { value, slice, .. }) => { self.unparse_expr(value, precedence::ATOM)?; let mut lvl = precedence::TUPLE; - if let Expr::Tuple(crate::ExprTuple { elts, .. }) = &slice.node { + if let Expr::Tuple(crate::ExprTuple { elts, .. }) = slice.as_ref() { if elts .iter() - .any(|expr| matches!(expr.node, Expr::Starred { .. })) + .any(|expr| expr.is_starred_expr()) { lvl += 1 } @@ -487,8 +487,8 @@ impl<'a> Unparser<'a> { Ok(()) } fn unparse_arg(&mut self, arg: &Arg) -> fmt::Result { - self.p_id(&arg.node.arg)?; - if let Some(ann) = &arg.node.annotation { + self.p_id(&arg.arg)?; + if let Some(ann) = &arg.annotation { write!(self, ": {}", **ann)?; } Ok(()) @@ -554,7 +554,7 @@ impl<'a> Unparser<'a> { } fn unparse_fstring_elem(&mut self, expr: &Expr, is_spec: bool) -> fmt::Result { - match &expr.node { + match &expr { Expr::Constant(crate::ExprConstant { value, .. }) => { if let Constant::Str(s) = value { self.unparse_fstring_str(s) diff --git a/core/src/source_code.rs b/core/src/source_code.rs index 4440fd8..8080da4 100644 --- a/core/src/source_code.rs +++ b/core/src/source_code.rs @@ -3,7 +3,7 @@ pub use ruff_source_location::*; pub type LineNumber = OneIndexed; -#[derive(Debug)] +#[derive(Debug, Copy, Clone)] pub struct SourceRange { pub start: SourceLocation, pub end: Option, diff --git a/parser/Cargo.toml b/parser/Cargo.toml index 31de28c..b0c5466 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -12,6 +12,7 @@ edition = "2021" default = ["location"] location = ["rustpython-ast/location"] serde = ["dep:serde", "rustpython-parser-core/serde"] +more-attributes = ["rustpython-ast/more-attributes"] [build-dependencies] anyhow = { workspace = true } diff --git a/parser/src/context.rs b/parser/src/context.rs index c3291a0..f3bf01f 100644 --- a/parser/src/context.rs +++ b/parser/src/context.rs @@ -1,71 +1,54 @@ -use crate::ast::{self, Expr, ExprContext, ExprKind}; +use crate::ast::{self, Expr, ExprContext}; pub(crate) fn set_context(expr: Expr, ctx: ExprContext) -> Expr { - match expr.node { - ExprKind::Name(ast::ExprName { id, range, .. }) => Expr { - node: ast::ExprName { id, ctx, range }.into(), - ..expr - }, - ExprKind::Tuple(ast::ExprTuple { elts, range, .. }) => Expr { - node: ast::ExprTuple { - elts: elts - .into_iter() - .map(|elt| set_context(elt, ctx.clone())) - .collect(), - range, - ctx, - } - .into(), - ..expr - }, - ExprKind::List(ast::ExprList { elts, range, .. }) => Expr { - node: ast::ExprList { - elts: elts - .into_iter() - .map(|elt| set_context(elt, ctx.clone())) - .collect(), - range, - ctx, - } - .into(), - ..expr - }, - ExprKind::Attribute(ast::ExprAttribute { + match expr { + Expr::Name(ast::ExprName { id, range, .. }) => ast::ExprName { id, ctx, range }.into(), + Expr::Tuple(ast::ExprTuple { elts, range, .. }) => ast::ExprTuple { + elts: elts + .into_iter() + .map(|elt| set_context(elt, ctx.clone())) + .collect(), + range, + ctx, + } + .into(), + + Expr::List(ast::ExprList { elts, range, .. }) => ast::ExprList { + elts: elts + .into_iter() + .map(|elt| set_context(elt, ctx.clone())) + .collect(), + range, + ctx, + } + .into(), + Expr::Attribute(ast::ExprAttribute { value, attr, range, .. - }) => Expr { - node: ast::ExprAttribute { - value, - attr, - range, - ctx, - } - .into(), - ..expr - }, - ExprKind::Subscript(ast::ExprSubscript { + }) => ast::ExprAttribute { + value, + attr, + range, + ctx, + } + .into(), + Expr::Subscript(ast::ExprSubscript { value, slice, range, .. - }) => Expr { - node: ast::ExprSubscript { - value, - slice, - range, - ctx, - } - .into(), - ..expr - }, - ExprKind::Starred(ast::ExprStarred { value, range, .. }) => Expr { - node: ast::ExprStarred { - value: Box::new(set_context(*value, ctx.clone())), - range, - ctx, - } - .into(), - ..expr - }, + }) => ast::ExprSubscript { + value, + slice, + range, + ctx, + } + .into(), + Expr::Starred(ast::ExprStarred { value, range, .. }) => ast::ExprStarred { + value: Box::new(set_context(*value, ctx.clone())), + range, + ctx, + } + .into(), _ => expr, } } diff --git a/parser/src/function.rs b/parser/src/function.rs index b3ba71a..0c7cafa 100644 --- a/parser/src/function.rs +++ b/parser/src/function.rs @@ -21,7 +21,7 @@ type ParameterDef = (ast::Arg, Option); pub(crate) fn validate_arguments( arguments: ast::Arguments, ) -> Result { - let mut all_args: Vec<&ast::Attributed> = vec![]; + let mut all_args: Vec<&ast::Arg> = vec![]; all_args.extend(arguments.posonlyargs.iter()); all_args.extend(arguments.args.iter()); @@ -118,11 +118,11 @@ pub(crate) fn parse_args(func_args: Vec) -> Result { // Positional arguments mustn't follow keyword arguments. @@ -148,8 +148,8 @@ pub(crate) fn parse_args(func_args: Vec) -> Result bool { - matches!(exp.node, ast::ExprKind::Starred { .. }) +const fn is_starred(exp: &ast::Expr) -> bool { + exp.is_starred_expr() } #[cfg(test)] diff --git a/parser/src/parser.rs b/parser/src/parser.rs index 7152c6d..4d443bb 100644 --- a/parser/src/parser.rs +++ b/parser/src/parser.rs @@ -318,6 +318,20 @@ impl ParseErrorType { } } +#[cfg(feature = "more-attributes")] +#[inline(always)] +pub(super) fn range_or_phantom>( + range: T, +) -> crate::text_size::TextRange { + range.into() +} + +#[cfg(not(feature = "more-attributes"))] +#[inline(always)] +pub(super) fn range_or_phantom(_: T) -> std::marker::PhantomData { + std::marker::PhantomData:: +} + #[cfg(test)] mod tests { use super::*; diff --git a/parser/src/python.lalrpop b/parser/src/python.lalrpop index 3503cd4..4bf7667 100644 --- a/parser/src/python.lalrpop +++ b/parser/src/python.lalrpop @@ -4,11 +4,11 @@ // See also: https://greentreesnakes.readthedocs.io/en/latest/nodes.html#keyword use crate::{ - ast::ranged::{self as ast, Ranged}, + ast::{self as ast, Ranged}, lexer::{LexicalError, LexicalErrorType}, function::{ArgumentList, parse_args, parse_params, validate_arguments}, context::set_context, - string::parse_strings, + string::parse_strings, parser::range_or_phantom, token::{self, StringKind}, text_size::TextSize, }; @@ -20,9 +20,9 @@ grammar; // For each public entry point, a full parse table is generated. // By having only a single pub function, we reduce this to one. pub Top: ast::Mod = { - StartModule => ast::ModModule { body, type_ignores: vec![], range: (start..end).into() }.into(), - StartInteractive => ast::ModInteractive { body, range: (start..end).into() }.into(), - StartExpression ("\n")* => ast::ModExpression { body: Box::new(body), range: (start..end).into() }.into() + StartModule => ast::ModModule { body, type_ignores: vec![], range: range_or_phantom(start..end) }.into(), + StartInteractive => ast::ModInteractive { body, range: range_or_phantom(start..end) }.into(), + StartExpression ("\n")* => ast::ModExpression { body: Box::new(body), range: range_or_phantom(start..end) }.into() }; Program: ast::Suite = { @@ -68,15 +68,13 @@ SmallStatement: ast::Stmt = { PassStatement: ast::Stmt = { "pass" => { - ast::Stmt::new( - ast::StmtKind::Pass(ast::StmtPass { range: (location..end_location).into() }), - ) + ast::Stmt::Pass(ast::StmtPass { range: (location..end_location).into() }) }, }; DelStatement: ast::Stmt = { "del" => { - ast::Stmt::new( + ast::Stmt::Delete( ast::StmtDelete { targets: targets.into_iter().map(|expr| set_context(expr, ast::ExprContext::Del)).collect(), range: (location..end_location).into() } ) }, @@ -86,7 +84,7 @@ ExpressionStatement: ast::Stmt = { => { // Just an expression, no assignment: if suffix.is_empty() { - ast::Stmt::new( + ast::Stmt::Expr( ast::StmtExpr { value: Box::new(expression), range: (location..end_location).into() } ) } else { @@ -99,13 +97,13 @@ ExpressionStatement: ast::Stmt = { let value = Box::new(values.into_iter().next().unwrap()); - ast::Stmt::new( + ast::Stmt::Assign( ast::StmtAssign { targets, value, type_comment: None, range: (location..end_location).into() } ) } }, => { - ast::Stmt::new( + ast::Stmt::AugAssign( ast::StmtAugAssign { target: Box::new(set_context(target, ast::ExprContext::Store)), op, @@ -115,8 +113,8 @@ ExpressionStatement: ast::Stmt = { ) }, > ":" > => { - let simple = matches!(target.node, ast::ExprKind::Name { .. }); - ast::Stmt::new( + let simple = target.is_name_expr(); + ast::Stmt::AnnAssign( ast::StmtAnnAssign { target: Box::new(set_context(target, ast::ExprContext::Store)), annotation: Box::new(annotation), @@ -176,22 +174,19 @@ AugAssign: ast::Operator = { FlowStatement: ast::Stmt = { "break" => { - ast::Stmt::new( - ast::StmtKind::Break(ast::StmtBreak { range: (location..end_location).into() }), - ) + + ast::Stmt::Break(ast::StmtBreak { range: (location..end_location).into() }) }, "continue" => { - ast::Stmt::new( - ast::StmtKind::Continue(ast::StmtContinue { range: (location..end_location).into() }), - ) + ast::Stmt::Continue(ast::StmtContinue { range: (location..end_location).into() }) }, "return" => { - ast::Stmt::new( + ast::Stmt::Return( ast::StmtReturn { value: value.map(Box::new), range: (location..end_location).into() } ) }, => { - ast::Stmt::new( + ast::Stmt::Expr( ast::StmtExpr { value: Box::new(expression), range: (location..end_location).into() } ) }, @@ -200,12 +195,12 @@ FlowStatement: ast::Stmt = { RaiseStatement: ast::Stmt = { "raise" => { - ast::Stmt::new( + ast::Stmt::Raise( ast::StmtRaise { exc: None, cause: None, range: (location..end_location).into() } ) }, "raise" > )?> => { - ast::Stmt::new( + ast::Stmt::Raise( ast::StmtRaise { exc: Some(Box::new(t)), cause: c.map(|x| Box::new(x.1)), range: (location..end_location).into() } ) }, @@ -213,13 +208,13 @@ RaiseStatement: ast::Stmt = { ImportStatement: ast::Stmt = { "import" >> => { - ast::Stmt::new( + ast::Stmt::Import( ast::StmtImport { names, range: (location..end_location).into() } ) }, "from" "import" => { let (level, module) = source; - ast::Stmt::new( + ast::Stmt::ImportFrom( ast::StmtImportFrom { level, module, @@ -249,14 +244,14 @@ ImportAsNames: Vec = { "(" >> ","? ")" => i, "*" => { // Star import all - vec![ast::Alias::new(ast::AliasData { name: ast::Identifier::new("*"), asname: None, range: (location..end_location).into() })] + vec![ast::Alias { name: ast::Identifier::new("*"), asname: None, range: (location..end_location).into() }] }, }; #[inline] ImportAsAlias: ast::Alias = { - => ast::Alias::new(ast::AliasData { name, asname: a.map(|a| a.1), range: (location..end_location).into() }), + => ast::Alias { name, asname: a.map(|a| a.1), range: (location..end_location).into() }, } // A name like abc or abc.def.ghi @@ -274,7 +269,7 @@ DottedName: ast::Identifier = { GlobalStatement: ast::Stmt = { "global" > => { - ast::Stmt::new( + ast::Stmt::Global( ast::StmtGlobal { names, range: (location..end_location).into() } ) }, @@ -282,7 +277,7 @@ GlobalStatement: ast::Stmt = { NonlocalStatement: ast::Stmt = { "nonlocal" > => { - ast::Stmt::new( + ast::Stmt::Nonlocal( ast::StmtNonlocal { names, range: (location..end_location).into() } ) }, @@ -290,7 +285,7 @@ NonlocalStatement: ast::Stmt = { AssertStatement: ast::Stmt = { "assert" > )?> => { - ast::Stmt::new( + ast::Stmt::Assert( ast::StmtAssert { test: Box::new(test), msg: msg.map(|e| Box::new(e.1)), @@ -320,7 +315,7 @@ MatchStatement: ast::Stmt = { .last() .unwrap() .end(); - ast::Stmt::new( + ast::Stmt::Match( ast::StmtMatch { subject: Box::new(subject), cases, @@ -336,7 +331,7 @@ MatchStatement: ast::Stmt = { .last() .unwrap() .end(); - ast::Stmt::new( + ast::Stmt::Match( ast::StmtMatch { subject: Box::new(subject), cases, @@ -354,9 +349,9 @@ MatchStatement: ast::Stmt = { .end(); let mut subjects = subjects; subjects.insert(0, subject); - ast::Stmt::new( + ast::Stmt::Match( ast::StmtMatch { - subject: Box::new(ast::Expr::new( + subject: Box::new(ast::Expr::Tuple( ast::ExprTuple { elts: subjects, ctx: ast::ExprContext::Load, @@ -376,7 +371,7 @@ MatchCase: ast::MatchCase = { pattern, guard: guard.map(Box::new), body, - range: (start..end).into() + range: range_or_phantom(start..end) } }, } @@ -388,7 +383,7 @@ Guard: ast::Expr = { } Patterns: ast::Pattern = { - "," => ast::Pattern::new( + "," => ast::Pattern::MatchSequence( ast::PatternMatchSequence { patterns: vec![pattern], range: (location..end_location).into() @@ -397,7 +392,7 @@ Patterns: ast::Pattern = { "," > ","? => { let mut patterns = patterns; patterns.insert(0, pattern); - ast::Pattern::new( + ast::Pattern::MatchSequence( ast::PatternMatchSequence { patterns, range: (location..end_location).into() @@ -420,7 +415,7 @@ AsPattern: ast::Pattern = { location, })? } else { - Ok(ast::Pattern::new( + Ok(ast::Pattern::MatchAs( ast::PatternMatchAs { pattern: Some(Box::new(pattern)), name: Some(name), @@ -436,39 +431,25 @@ OrPattern: ast::Pattern = { )+> => { let mut patterns = patterns; patterns.insert(0, pattern); - ast::Pattern::new( + ast::Pattern::MatchOr( ast::PatternMatchOr { patterns, range: (location..end_location).into() } ) } } ClosedPattern: ast::Pattern = { - => ast::Pattern::new( - node, - ), - => ast::Pattern::new( - node, - ), - => ast::Pattern::new( - node, - ), - => ast::Pattern::new( - node, - ), - => ast::Pattern::new( - node, - ), - => ast::Pattern::new( - node, - ), - => ast::Pattern::new( - node, - ), + => node, + => node, + => node, + => node, + => node, + => node, + => node, } -SequencePattern: ast::PatternKind = { +SequencePattern: ast::Pattern = { // A single-item tuple is a special case: it's a group pattern, _not_ a sequence pattern. - "(" ")" => pattern.node, + "(" ")" => pattern, "(" ")" => ast::PatternMatchSequence { patterns: vec![], range: (location..end_location).into() @@ -487,7 +468,7 @@ SequencePattern: ast::PatternKind = { }.into(), } -StarPattern: ast::PatternKind = { +StarPattern: ast::Pattern = { "*" => ast::PatternMatchStar { name: if name.as_str() == "_" { None } else { Some(name) }, range: (location..end_location).into() @@ -495,14 +476,14 @@ StarPattern: ast::PatternKind = { } ConstantAtom: ast::Expr = { - => ast::Expr::new( + => ast::Expr::Constant( ast::ExprConstant { value, kind: None, range: (location..end_location).into() } ), } ConstantExpr: ast::Expr = { ConstantAtom, - "-" => ast::Expr::new( + "-" => ast::Expr::UnaryOp( ast::ExprUnaryOp { op: ast::Unaryop::USub, operand: Box::new(operand), @@ -512,7 +493,7 @@ ConstantExpr: ast::Expr = { } AddOpExpr: ast::Expr = { - => ast::Expr::new( + => ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(left), op, @@ -522,7 +503,7 @@ AddOpExpr: ast::Expr = { ), } -LiteralPattern: ast::PatternKind = { +LiteralPattern: ast::Pattern = { "None" => ast::PatternMatchSingleton { value: ast::Constant::None, range: (location..end_location).into() @@ -549,7 +530,7 @@ LiteralPattern: ast::PatternKind = { }.into()), } -CapturePattern: ast::PatternKind = { +CapturePattern: ast::Pattern = { => ast::PatternMatchAs { pattern: None, name: if name.as_str() == "_" { None } else { Some(name) }, @@ -558,13 +539,13 @@ CapturePattern: ast::PatternKind = { } MatchName: ast::Expr = { - => ast::Expr::new( + => ast::Expr::Name( ast::ExprName { id: name, ctx: ast::ExprContext::Load, range: (location..end_location).into() }, ), } MatchNameOrAttr: ast::Expr = { - "." => ast::Expr::new( + "." => ast::Expr::Attribute( ast::ExprAttribute { value: Box::new(name), attr, @@ -572,7 +553,7 @@ MatchNameOrAttr: ast::Expr = { range: (location..end_location).into() }, ), - "." => ast::Expr::new( + "." => ast::Expr::Attribute( ast::ExprAttribute { value: Box::new(e), attr, @@ -582,7 +563,7 @@ MatchNameOrAttr: ast::Expr = { ) } -ValuePattern: ast::PatternKind = { +ValuePattern: ast::Pattern = { => ast::PatternMatchValue { value: Box::new(e), range: (location..end_location).into() @@ -593,21 +574,21 @@ MappingKey: ast::Expr = { ConstantExpr, AddOpExpr, MatchNameOrAttr, - "None" => ast::Expr::new( + "None" => ast::Expr::Constant( ast::ExprConstant { value: ast::Constant::None, kind: None, range: (location..end_location).into() }, ), - "True" => ast::Expr::new( + "True" => ast::Expr::Constant( ast::ExprConstant { value: true.into(), kind: None, range: (location..end_location).into() }, ), - "False" => ast::Expr::new( + "False" => ast::Expr::Constant( ast::ExprConstant { value: false.into(), kind: None, @@ -621,7 +602,7 @@ MatchMappingEntry: (ast::Expr, ast::Pattern) = { ":" => (k, v), }; -MappingPattern: ast::PatternKind = { +MappingPattern: ast::Pattern = { "{" "}" => { return ast::PatternMatchMapping { keys: vec![], @@ -666,7 +647,7 @@ MatchKeywordEntry: (ast::Identifier, ast::Pattern) = { "=" => (k, v), }; -ClassPattern: ast::PatternKind = { +ClassPattern: ast::Pattern = { "(" > "," > ","? ")" => { let (kwd_attrs, kwd_patterns) = kwds .into_iter() @@ -765,13 +746,13 @@ IfStatement: ast::Stmt = { .end(); // handle elif: for i in s2.into_iter().rev() { - let x = ast::Stmt::new( + let x = ast::Stmt::If( ast::StmtIf { test: Box::new(i.2), body: i.4, orelse: last, range: (i.0..end_location).into() } ); last = vec![x]; } - ast::Stmt::new( + ast::Stmt::If( ast::StmtIf { test: Box::new(test), body, orelse: last, range: (location..end_location).into() } ) }, @@ -785,7 +766,7 @@ WhileStatement: ast::Stmt = { .or_else(|| body.last()) .unwrap() .end(); - ast::Stmt::new( + ast::Stmt::While( ast::StmtWhile { test: Box::new(test), body, @@ -807,12 +788,11 @@ ForStatement: ast::Stmt = { let target = Box::new(set_context(target, ast::ExprContext::Store)); let iter = Box::new(iter); let type_comment = None; - let node: ast::StmtKind = if is_async.is_some() { - ast::StmtAsyncFor { target, iter, body, orelse, type_comment, range: (location..end_location).into() }.into() + if is_async.is_some() { + ast::Stmt::AsyncFor(ast::StmtAsyncFor { target, iter, body, orelse, type_comment, range: (location..end_location).into() }) } else { - ast::StmtFor { target, iter, body, orelse, type_comment, range: (location..end_location).into() }.into() - }; - ast::Stmt::new(node) + ast::Stmt::For(ast::StmtFor { target, iter, body, orelse, type_comment, range: (location..end_location).into() }) + } }, }; @@ -826,7 +806,7 @@ TryStatement: ast::Stmt = { .or_else(|| orelse.last().map(|last| last.end())) .or_else(|| handlers.last().map(|last| last.end())) .unwrap(); - ast::Stmt::new( + ast::Stmt::Try( ast::StmtTry { body, handlers, @@ -845,7 +825,7 @@ TryStatement: ast::Stmt = { .map(|last| last.end()) .or_else(|| handlers.last().map(|last| last.end())) .unwrap(); - ast::Stmt::new( + ast::Stmt::TryStar( ast::StmtTryStar { body, handlers, @@ -860,7 +840,7 @@ TryStatement: ast::Stmt = { let orelse = vec![]; let finalbody = finally.2; let end_location = finalbody.last().unwrap().end(); - ast::Stmt::new( + ast::Stmt::Try( ast::StmtTry { body, handlers, @@ -875,7 +855,7 @@ TryStatement: ast::Stmt = { ExceptStarClause: ast::Excepthandler = { "except" "*" > ":" => { let end_location = body.last().unwrap().end(); - ast::Excepthandler::new( + ast::Excepthandler::ExceptHandler( ast::ExcepthandlerExceptHandler { type_: Some(Box::new(typ)), name: None, @@ -886,7 +866,7 @@ ExceptStarClause: ast::Excepthandler = { }, "except" "*" "as" Identifier)> ":" => { let end_location = body.last().unwrap().end(); - ast::Excepthandler::new( + ast::Excepthandler::ExceptHandler( ast::ExcepthandlerExceptHandler { type_: Some(Box::new(x.0)), name: Some(x.2), @@ -901,7 +881,7 @@ ExceptStarClause: ast::Excepthandler = { ExceptClause: ast::Excepthandler = { "except" ?> ":" => { let end_location = body.last().unwrap().end(); - ast::Excepthandler::new( + ast::Excepthandler::ExceptHandler( ast::ExcepthandlerExceptHandler { type_: typ.map(Box::new), name: None, @@ -912,7 +892,7 @@ ExceptClause: ast::Excepthandler = { }, "except" "as" Identifier)> ":" => { let end_location = body.last().unwrap().end(); - ast::Excepthandler::new( + ast::Excepthandler::ExceptHandler( ast::ExcepthandlerExceptHandler { type_: Some(Box::new(x.0)), name: Some(x.2), @@ -927,12 +907,11 @@ WithStatement: ast::Stmt = { "with" ":" => { let end_location = body.last().unwrap().end(); let type_comment = None; - let node: ast::StmtKind = if is_async.is_some() { + if is_async.is_some() { ast::StmtAsyncWith { items, body, type_comment, range: (location..end_location).into() }.into() } else { ast::StmtWith { items, body, type_comment, range: (location..end_location).into() }.into() - }; - ast::Stmt::new(node) + } }, }; @@ -950,15 +929,15 @@ WithItems: Vec = { #[inline] WithItemsNoAs: Vec = { >> => { - all.into_iter().map(|context_expr| ast::Withitem { context_expr, optional_vars: None, range: (location..end_location).into() }).collect() + all.into_iter().map(|context_expr| ast::Withitem { context_expr, optional_vars: None, range: range_or_phantom(location..end_location) }).collect() }, } WithItem: ast::Withitem = { - > if Goal != "as" => ast::Withitem { context_expr, optional_vars: None, range: (location..end_location).into() }, + > if Goal != "as" => ast::Withitem { context_expr, optional_vars: None, range: range_or_phantom(location..end_location) }, > "as" > => { let optional_vars = Some(Box::new(set_context(vars, ast::ExprContext::Store))); - ast::Withitem { context_expr, optional_vars, range: (location..end_location).into() } + ast::Withitem { context_expr, optional_vars, range: range_or_phantom(location..end_location) } }, }; @@ -968,12 +947,11 @@ FuncDef: ast::Stmt = { let returns = r.map(|x| Box::new(x.1)); let end_location = body.last().unwrap().end(); let type_comment = None; - let node: ast::StmtKind = if is_async.is_some() { + if is_async.is_some() { ast::StmtAsyncFunctionDef { name, args, body, decorator_list, returns, type_comment, range: (location..end_location).into() }.into() } else { ast::StmtFunctionDef { name, args, body, decorator_list, returns, type_comment, range: (location..end_location).into() }.into() - }; - ast::Stmt::new(node) + } }, }; @@ -988,7 +966,7 @@ Parameters: ast::Arguments = { kw_defaults: vec![], kwarg: None, defaults: vec![], - range: (location..end_location).into() + range: range_or_phantom(location..end_location) }) )?; @@ -1013,7 +991,7 @@ ParameterList: ast::Arguments = { kwarg, defaults, kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) }) }, > )> ","? =>? { @@ -1033,7 +1011,7 @@ ParameterList: ast::Arguments = { kwarg, defaults, kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) }) }, > ","? => { @@ -1046,7 +1024,7 @@ ParameterList: ast::Arguments = { kwarg, defaults: vec![], kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } }, > ","? => { @@ -1058,7 +1036,7 @@ ParameterList: ast::Arguments = { kwarg, defaults: vec![], kw_defaults: vec![], - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } }, }; @@ -1080,22 +1058,20 @@ ParameterDef: (ast::Arg, Option) = { }; UntypedParameter: ast::Arg = { - => ast::Arg::new( - ast::ArgData { arg, annotation: None, type_comment: None, range: (location..end_location).into() }, - ), + => ast::Arg { arg, annotation: None, type_comment: None, range: (location..end_location).into() }, }; TypedParameter: ast::Arg = { )?> => { let annotation = a.map(|x| Box::new(x.1)); - ast::Arg::new(ast::ArgData { arg, annotation, type_comment: None, range: (location..end_location).into() }) + ast::Arg { arg, annotation, type_comment: None, range: (location..end_location).into() } }, }; StarTypedParameter: ast::Arg = { => { let annotation = a.map(|x| Box::new(x.1)); - ast::Arg::new(ast::ArgData { arg, annotation, type_comment: None, range: (location..end_location).into() }) + ast::Arg { arg, annotation, type_comment: None, range: (location..end_location).into() } }, }; @@ -1145,7 +1121,7 @@ ClassDef: ast::Stmt = { None => (vec![], vec![]), }; let end_location = body.last().unwrap().end(); - ast::Stmt::new( + ast::Stmt::ClassDef( ast::StmtClassDef { name, bases, @@ -1166,16 +1142,16 @@ Decorator: ast::Expr = { }; YieldExpr: ast::Expr = { - "yield" => ast::Expr::new( + "yield" => ast::Expr::Yield( ast::ExprYield { value: value.map(Box::new), range: (location..end_location).into() } ), - "yield" "from" > => ast::Expr::new( + "yield" "from" > => ast::Expr::YieldFrom( ast::ExprYieldFrom { value: Box::new(e), range: (location..end_location).into() } ), }; Test: ast::Expr = { - > "if" > "else" > => ast::Expr::new( + > "if" > "else" > => ast::Expr::IfExp( ast::ExprIfExp { test: Box::new(test), body: Box::new(body), @@ -1194,9 +1170,9 @@ NamedExpressionTest: ast::Expr = { NamedExpression: ast::Expr = { ":=" > => { - ast::Expr::new( + ast::Expr::NamedExpr( ast::ExprNamedExpr { - target: Box::new(ast::Expr::new( + target: Box::new(ast::Expr::Name( ast::ExprName { id, ctx: ast::ExprContext::Store, range: (location..end_location).into() }, )), range: (location..value.end()).into(), @@ -1218,12 +1194,12 @@ LambdaDef: ast::Expr = { kw_defaults: vec![], kwarg: None, defaults: vec![], - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } } ))?; - Ok(ast::Expr::new( + Ok(ast::Expr::Lambda( ast::ExprLambda { args: Box::new(p), body: Box::new(body), @@ -1237,7 +1213,7 @@ OrTest: ast::Expr = { > )+> => { let mut values = vec![e1]; values.extend(e2.into_iter().map(|e| e.1)); - ast::Expr::new( + ast::Expr::BoolOp( ast::ExprBoolOp { op: ast::Boolop::Or, values, range: (location..end_location).into() } ) }, @@ -1248,7 +1224,7 @@ AndTest: ast::Expr = { > )+> => { let mut values = vec![e1]; values.extend(e2.into_iter().map(|e| e.1)); - ast::Expr::new( + ast::Expr::BoolOp( ast::ExprBoolOp { op: ast::Boolop::And, values, range: (location..end_location).into() } ) }, @@ -1256,7 +1232,7 @@ AndTest: ast::Expr = { }; NotTest: ast::Expr = { - "not" > => ast::Expr::new( + "not" > => ast::Expr::UnaryOp( ast::ExprUnaryOp { operand: Box::new(e), op: ast::Unaryop::Not, range: (location..end_location).into() } ), Comparison, @@ -1265,7 +1241,7 @@ NotTest: ast::Expr = { Comparison: ast::Expr = { > )+> => { let (ops, comparators) = comparisons.into_iter().unzip(); - ast::Expr::new( + ast::Expr::Compare( ast::ExprCompare { left: Box::new(left), ops, comparators, range: (location..end_location).into() } ) }, @@ -1286,28 +1262,28 @@ CompOp: ast::Cmpop = { }; Expression: ast::Expr = { - > "|" > => ast::Expr::new( + > "|" > => ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitOr, right: Box::new(e2), range: (location..end_location).into() } ), XorExpression, }; XorExpression: ast::Expr = { - > "^" > => ast::Expr::new( + > "^" > => ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitXor, right: Box::new(e2), range: (location..end_location).into() } ), AndExpression, }; AndExpression: ast::Expr = { - > "&" > => ast::Expr::new( + > "&" > => ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitAnd, right: Box::new(e2), range: (location..end_location).into() } ), ShiftExpression, }; ShiftExpression: ast::Expr = { - > > => ast::Expr::new( + > > => ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op, right: Box::new(e2), range: (location..end_location).into() } ), ArithmeticExpression, @@ -1319,7 +1295,7 @@ ShiftOp: ast::Operator = { }; ArithmeticExpression: ast::Expr = { - > > => ast::Expr::new( + > > => ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(a), op, right: Box::new(b), range: (location..end_location).into() } ), Term, @@ -1331,7 +1307,7 @@ AddOp: ast::Operator = { }; Term: ast::Expr = { - > > => ast::Expr::new( + > > => ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(a), op, right: Box::new(b), range: (location..end_location).into() } ), Factor, @@ -1346,7 +1322,7 @@ MulOp: ast::Operator = { }; Factor: ast::Expr = { - > => ast::Expr::new( + > => ast::Expr::UnaryOp( ast::ExprUnaryOp { operand: Box::new(e), op, range: (location..end_location).into() } ), Power, @@ -1359,7 +1335,7 @@ UnaryOp: ast::Unaryop = { }; Power: ast::Expr = { - > "**" > => ast::Expr::new( + > "**" > => ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e), op: ast::Operator::Pow, right: Box::new(b), range: (location..end_location).into() } ), AtomExpr, @@ -1367,7 +1343,7 @@ Power: ast::Expr = { AtomExpr: ast::Expr = { "await" > => { - ast::Expr::new( + ast::Expr::Await( ast::ExprAwait { value: Box::new(atom), range: (location..end_location).into() } ) }, @@ -1377,14 +1353,14 @@ AtomExpr: ast::Expr = { AtomExpr2: ast::Expr = { Atom, > "(" ")" => { - ast::Expr::new( + ast::Expr::Call( ast::ExprCall { func: Box::new(f), args: a.args, keywords: a.keywords, range: (location..end_location).into() } ) }, - > "[" "]" => ast::Expr::new( + > "[" "]" => ast::Expr::Subscript( ast::ExprSubscript { value: Box::new(e), slice: Box::new(s), ctx: ast::ExprContext::Load, range: (location..end_location).into() } ), - > "." => ast::Expr::new( + > "." => ast::Expr::Attribute( ast::ExprAttribute { value: Box::new(e), attr, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ), }; @@ -1399,7 +1375,7 @@ SubscriptList: ast::Expr = { dims.push(x.1) } - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts: dims, ctx: ast::ExprContext::Load, range: (location..end_location).into() }, ) } @@ -1412,7 +1388,7 @@ Subscript: ast::Expr = { let lower = e1.map(Box::new); let upper = e2.map(Box::new); let step = e3.flatten().map(Box::new); - ast::Expr::new( + ast::Expr::Slice( ast::ExprSlice { lower, upper, step, range: (location..end_location).into() } ) } @@ -1424,20 +1400,20 @@ SliceOp: Option = { Atom: ast::Expr = { =>? Ok(parse_strings(s)?), - => ast::Expr::new( + => ast::Expr::Constant( ast::ExprConstant { value, kind: None, range: (location..end_location).into() } ), - => ast::Expr::new( + => ast::Expr::Name( ast::ExprName { id: name, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ), "[" "]" => { let elts = e.unwrap_or_default(); - ast::Expr::new( + ast::Expr::List( ast::ExprList { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) }, "[" "]" => { - ast::Expr::new( + ast::Expr::ListComp( ast::ExprListComp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) }, @@ -1445,14 +1421,14 @@ Atom: ast::Expr = { if elts.len() == 1 && trailing_comma.is_none() { elts.into_iter().next().unwrap() } else { - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } }, "(" >> ",")?> )*> ")" =>? { if left.is_none() && right.is_empty() && trailing_comma.is_none() { - if matches!(mid.node, ast::ExprKind::Starred { .. }) { + if mid.is_starred_expr() { Err(LexicalError{ error: LexicalErrorType::OtherError("cannot use starred expression here".to_string()), location: mid.start(), @@ -1461,17 +1437,17 @@ Atom: ast::Expr = { Ok(mid) } else { let elts = left.into_iter().flatten().chain([mid]).chain(right).collect(); - Ok(ast::Expr::new( + Ok(ast::Expr::Tuple( ast::ExprTuple { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() }, )) } }, - "(" ")" => ast::Expr::new( + "(" ")" => ast::Expr::Tuple( ast::ExprTuple { elts: Vec::new(), ctx: ast::ExprContext::Load, range: (location..end_location).into() } ), "(" ")" => e, "(" ")" => { - ast::Expr::new( + ast::Expr::GeneratorExp( ast::ExprGeneratorExp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) }, @@ -1487,12 +1463,12 @@ Atom: ast::Expr = { .into_iter() .map(|(k, v)| (k.map(|x| *x), v)) .unzip(); - ast::Expr::new( + ast::Expr::Dict( ast::ExprDict { keys, values, range: (location..end_location).into() } ) }, "{" "}" => { - ast::Expr::new( + ast::Expr::DictComp( ast::ExprDictComp { key: Box::new(e1.0), value: Box::new(e1.1), @@ -1501,18 +1477,18 @@ Atom: ast::Expr = { } ) }, - "{" "}" => ast::Expr::new( + "{" "}" => ast::Expr::Set( ast::ExprSet { elts, range: (location..end_location).into() } ), "{" "}" => { - ast::Expr::new( + ast::Expr::SetComp( ast::ExprSetComp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) }, - "True" => ast::Expr::new(ast::ExprConstant { value: true.into(), kind: None, range: (location..end_location).into() }), - "False" => ast::Expr::new(ast::ExprConstant { value: false.into(), kind: None, range: (location..end_location).into() }), - "None" => ast::Expr::new(ast::ExprConstant { value: ast::Constant::None, kind: None, range: (location..end_location).into() }), - "..." => ast::Expr::new(ast::ExprConstant { value: ast::Constant::Ellipsis, kind: None, range: (location..end_location).into() }), + "True" => ast::Expr::Constant(ast::ExprConstant { value: true.into(), kind: None, range: (location..end_location).into() }), + "False" => ast::Expr::Constant(ast::ExprConstant { value: false.into(), kind: None, range: (location..end_location).into() }), + "None" => ast::Expr::Constant(ast::ExprConstant { value: ast::Constant::None, kind: None, range: (location..end_location).into() }), + "..." => ast::Expr::Constant(ast::ExprConstant { value: ast::Constant::Ellipsis, kind: None, range: (location..end_location).into() }), }; ListLiteralValues: Vec = { @@ -1563,7 +1539,7 @@ GenericList: ast::Expr = { if elts.len() == 1 && trailing_comma.is_none() { elts.into_iter().next().unwrap() } else { - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -1572,7 +1548,7 @@ GenericList: ast::Expr = { // Test StarExpr: ast::Expr = { - "*" > => ast::Expr::new( + "*" > => ast::Expr::Starred( ast::ExprStarred { value: Box::new(e), ctx: ast::ExprContext::Load, range: (location..end_location).into() }, ) }; @@ -1588,7 +1564,7 @@ SingleForComprehension: ast::Comprehension = { iter, ifs, is_async, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } } }; @@ -1606,7 +1582,7 @@ ArgumentList: ArgumentList = { FunctionArgument: (Option<(TextSize, TextSize, Option)>, ast::Expr) = { => { let expr = match c { - Some(c) => ast::Expr::new( + Some(c) => ast::Expr::GeneratorExp( ast::ExprGeneratorExp { elt: Box::new(e), generators: c, @@ -1619,7 +1595,7 @@ FunctionArgument: (Option<(TextSize, TextSize, Option)>, ast::E }, "=" > => (Some((location, end_location, Some(i))), e), "*" > => { - let expr = ast::Expr::new( + let expr = ast::Expr::Starred( ast::ExprStarred { value: Box::new(e), ctx: ast::ExprContext::Load, range: (location..end_location).into() }, ); (None, expr) diff --git a/parser/src/python.rs b/parser/src/python.rs index 46e0ae0..9a14046 100644 --- a/parser/src/python.rs +++ b/parser/src/python.rs @@ -1,11 +1,11 @@ // auto-generated: "lalrpop 0.20.0" -// sha3: 8a3fbd9c7ec6b7da4f0fc78dee12593317d7407da92a4ff54c0c398bf36bee6e +// sha3: 66396fb90bec55aae5a20216846cc3a01d7e611d2b96a5a07e58b7cde5caeab3 use crate::{ - ast::ranged::{self as ast, Ranged}, + ast::{self as ast, Ranged}, lexer::{LexicalError, LexicalErrorType}, function::{ArgumentList, parse_args, parse_params, validate_arguments}, context::set_context, - string::parse_strings, + string::parse_strings, parser::range_or_phantom, token::{self, StringKind}, text_size::TextSize, }; @@ -22,11 +22,11 @@ extern crate alloc; mod __parse__Top { use crate::{ - ast::ranged::{self as ast, Ranged}, + ast::{self as ast, Ranged}, lexer::{LexicalError, LexicalErrorType}, function::{ArgumentList, parse_args, parse_params, validate_arguments}, context::set_context, - string::parse_strings, + string::parse_strings, parser::range_or_phantom, token::{self, StringKind}, text_size::TextSize, }; @@ -103,49 +103,48 @@ mod __parse__Top { Variant59(ast::Operator), Variant60(ArgumentList), Variant61(ast::Stmt), - Variant62(ast::PatternKind), - Variant63(Vec<(Option<(TextSize, TextSize, Option)>, ast::Expr)>), - Variant64(Vec), - Variant65(Vec), - Variant66(core::option::Option>), - Variant67(ast::Cmpop), - Variant68(ast::Constant), - Variant69((Option>, ast::Expr)), - Variant70((ast::Expr, ast::Expr)), - Variant71(Vec<(Option>, ast::Expr)>), - Variant72(core::option::Option>, ast::Expr)>>), - Variant73(ast::Identifier), - Variant74(ast::Excepthandler), - Variant75(alloc::vec::Vec), - Variant76(ast::Suite), - Variant77(alloc::vec::Vec), - Variant78(core::option::Option<(Option<(TextSize, TextSize, Option)>, ast::Expr)>), - Variant79(ast::Alias), - Variant80(Vec), - Variant81(ast::Int), - Variant82(alloc::vec::Vec), - Variant83((Option, Option)), - Variant84(Option>), - Variant85(ast::MatchCase), - Variant86(alloc::vec::Vec), - Variant87((ast::Identifier, ast::Pattern)), - Variant88((ast::Expr, ast::Pattern)), - Variant89(Vec), - Variant90(Vec<(ast::Identifier, ast::Pattern)>), - Variant91(Vec<(ast::Expr, ast::Pattern)>), - Variant92(Vec<(ast::Arg, Option)>), - Variant93((ast::Arg, Option)), - Variant94((Vec<(ast::Arg, Option)>, Vec<(ast::Arg, Option)>)), - Variant95((Option>, Vec, Vec, Option>)), - Variant96(core::option::Option), - Variant97(ast::Comprehension), - Variant98(alloc::vec::Vec), - Variant99(Option), - Variant100(core::option::Option>), - Variant101(ast::Arg), - Variant102(core::option::Option), - Variant103(ast::Mod), - Variant104(ast::Unaryop), + Variant62(Vec<(Option<(TextSize, TextSize, Option)>, ast::Expr)>), + Variant63(Vec), + Variant64(Vec), + Variant65(core::option::Option>), + Variant66(ast::Cmpop), + Variant67(ast::Constant), + Variant68((Option>, ast::Expr)), + Variant69((ast::Expr, ast::Expr)), + Variant70(Vec<(Option>, ast::Expr)>), + Variant71(core::option::Option>, ast::Expr)>>), + Variant72(ast::Identifier), + Variant73(ast::Excepthandler), + Variant74(alloc::vec::Vec), + Variant75(ast::Suite), + Variant76(alloc::vec::Vec), + Variant77(core::option::Option<(Option<(TextSize, TextSize, Option)>, ast::Expr)>), + Variant78(ast::Alias), + Variant79(Vec), + Variant80(ast::Int), + Variant81(alloc::vec::Vec), + Variant82((Option, Option)), + Variant83(Option>), + Variant84(ast::MatchCase), + Variant85(alloc::vec::Vec), + Variant86((ast::Identifier, ast::Pattern)), + Variant87((ast::Expr, ast::Pattern)), + Variant88(Vec), + Variant89(Vec<(ast::Identifier, ast::Pattern)>), + Variant90(Vec<(ast::Expr, ast::Pattern)>), + Variant91(Vec<(ast::Arg, Option)>), + Variant92((ast::Arg, Option)), + Variant93((Vec<(ast::Arg, Option)>, Vec<(ast::Arg, Option)>)), + Variant94((Option>, Vec, Vec, Option>)), + Variant95(core::option::Option), + Variant96(ast::Comprehension), + Variant97(alloc::vec::Vec), + Variant98(Option), + Variant99(core::option::Option>), + Variant100(ast::Arg), + Variant101(core::option::Option), + Variant102(ast::Mod), + Variant103(ast::Unaryop), } const __ACTION: &[i16] = &[ // State 0 @@ -13759,9 +13758,9 @@ mod __parse__Top { 76 => { // ("," ParameterListStarArgs) = ",", "*", StarTypedParameter, ",", KwargParameter => ActionFn(1202); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -13776,7 +13775,7 @@ mod __parse__Top { 77 => { // ("," ParameterListStarArgs) = ",", "*", ",", KwargParameter => ActionFn(1203); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -13792,10 +13791,10 @@ mod __parse__Top { 78 => { // ("," ParameterListStarArgs) = ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1204); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -13810,7 +13809,7 @@ mod __parse__Top { 79 => { // ("," ParameterListStarArgs) = ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1205); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -13827,7 +13826,7 @@ mod __parse__Top { 80 => { // ("," ParameterListStarArgs) = ",", "*", StarTypedParameter => ActionFn(1206); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -13857,7 +13856,7 @@ mod __parse__Top { // ("," ParameterListStarArgs) = ",", "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1208); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant28(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -13887,9 +13886,9 @@ mod __parse__Top { 84 => { // ("," ParameterListStarArgs)? = ",", "*", StarTypedParameter, ",", KwargParameter => ActionFn(1226); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -13904,7 +13903,7 @@ mod __parse__Top { 85 => { // ("," ParameterListStarArgs)? = ",", "*", ",", KwargParameter => ActionFn(1227); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -13920,10 +13919,10 @@ mod __parse__Top { 86 => { // ("," ParameterListStarArgs)? = ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1228); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -13938,7 +13937,7 @@ mod __parse__Top { 87 => { // ("," ParameterListStarArgs)? = ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1229); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -13955,7 +13954,7 @@ mod __parse__Top { 88 => { // ("," ParameterListStarArgs)? = ",", "*", StarTypedParameter => ActionFn(1230); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -13985,7 +13984,7 @@ mod __parse__Top { // ("," ParameterListStarArgs)? = ",", "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1232); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant28(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14018,9 +14017,9 @@ mod __parse__Top { 93 => { // ("," ParameterListStarArgs) = ",", "*", UntypedParameter, ",", KwargParameter => ActionFn(1262); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14035,7 +14034,7 @@ mod __parse__Top { 94 => { // ("," ParameterListStarArgs) = ",", "*", ",", KwargParameter => ActionFn(1263); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -14051,10 +14050,10 @@ mod __parse__Top { 95 => { // ("," ParameterListStarArgs) = ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1264); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14069,7 +14068,7 @@ mod __parse__Top { 96 => { // ("," ParameterListStarArgs) = ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1265); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -14086,7 +14085,7 @@ mod __parse__Top { 97 => { // ("," ParameterListStarArgs) = ",", "*", UntypedParameter => ActionFn(1266); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14116,7 +14115,7 @@ mod __parse__Top { // ("," ParameterListStarArgs) = ",", "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1268); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant28(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14146,9 +14145,9 @@ mod __parse__Top { 101 => { // ("," ParameterListStarArgs)? = ",", "*", UntypedParameter, ",", KwargParameter => ActionFn(1286); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14163,7 +14162,7 @@ mod __parse__Top { 102 => { // ("," ParameterListStarArgs)? = ",", "*", ",", KwargParameter => ActionFn(1287); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -14179,10 +14178,10 @@ mod __parse__Top { 103 => { // ("," ParameterListStarArgs)? = ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1288); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14197,7 +14196,7 @@ mod __parse__Top { 104 => { // ("," ParameterListStarArgs)? = ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1289); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -14214,7 +14213,7 @@ mod __parse__Top { 105 => { // ("," ParameterListStarArgs)? = ",", "*", UntypedParameter => ActionFn(1290); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14244,7 +14243,7 @@ mod __parse__Top { // ("," ParameterListStarArgs)? = ",", "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1292); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant28(__symbols); - let __sym2 = __pop_Variant101(__symbols); + let __sym2 = __pop_Variant100(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -14701,7 +14700,7 @@ mod __parse__Top { 239 => { // AsPattern = OrPattern, "as", Identifier => ActionFn(917); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant40(__symbols); let __start = __sym0.0; @@ -16139,7 +16138,7 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (1, 203) } 573 => { @@ -16458,12 +16457,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", StarTypedParameter, ",", KwargParameter, "," => ActionFn(1638); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1638::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -16477,13 +16476,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", StarTypedParameter, ",", KwargParameter, "," => ActionFn(1639); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1639::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -16497,14 +16496,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", StarTypedParameter, ",", KwargParameter, "," => ActionFn(1640); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1640::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -16518,15 +16517,15 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", StarTypedParameter, ",", KwargParameter, "," => ActionFn(1641); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1641::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -16540,15 +16539,15 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ",", KwargParameter, "," => ActionFn(1642); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1642::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -16562,16 +16561,16 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ",", KwargParameter, "," => ActionFn(1643); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1643::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -16585,11 +16584,11 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", ",", KwargParameter, "," => ActionFn(1644); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1644::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -16603,12 +16602,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", ",", KwargParameter, "," => ActionFn(1645); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1645::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -16622,13 +16621,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", ",", KwargParameter, "," => ActionFn(1646); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1646::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -16642,14 +16641,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", ",", KwargParameter, "," => ActionFn(1647); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1647::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -16663,14 +16662,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", ",", KwargParameter, "," => ActionFn(1648); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1648::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -16684,7 +16683,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", ",", KwargParameter, "," => ActionFn(1649); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -16692,7 +16691,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1649::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -16706,13 +16705,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1650); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1650::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -16726,14 +16725,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1651); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1651::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -16747,15 +16746,15 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1652); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1652::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -16769,16 +16768,16 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1653); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1653::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -16792,16 +16791,16 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1654); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1654::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -16815,17 +16814,17 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1655); assert!(__symbols.len() >= 12); let __sym11 = __pop_Variant0(__symbols); - let __sym10 = __pop_Variant84(__symbols); + let __sym10 = __pop_Variant83(__symbols); let __sym9 = __pop_Variant0(__symbols); let __sym8 = __pop_Variant28(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym11.2; let __nt = match super::__action1655::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10, __sym11) { @@ -16839,12 +16838,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1656); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1656::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -16858,13 +16857,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1657); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1657::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -16878,14 +16877,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1658); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1658::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -16899,7 +16898,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1659); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -16907,7 +16906,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1659::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -16921,7 +16920,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1660); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -16929,7 +16928,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1660::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -16943,7 +16942,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1661); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); let __sym6 = __pop_Variant0(__symbols); @@ -16952,7 +16951,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1661::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -16966,10 +16965,10 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", StarTypedParameter, "," => ActionFn(1662); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1662::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -16983,11 +16982,11 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", StarTypedParameter, "," => ActionFn(1663); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1663::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -17001,12 +17000,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", StarTypedParameter, "," => ActionFn(1664); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1664::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17020,13 +17019,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", StarTypedParameter, "," => ActionFn(1665); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1665::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17040,13 +17039,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, "," => ActionFn(1666); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1666::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17060,14 +17059,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, "," => ActionFn(1667); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1667::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17083,7 +17082,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1668::<>(__sym0, __sym1, __sym2, __sym3) { @@ -17100,7 +17099,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1669::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -17118,7 +17117,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1670::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -17137,7 +17136,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1671::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17156,7 +17155,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1672::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17176,7 +17175,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1673::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17191,10 +17190,10 @@ mod __parse__Top { assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1674::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -17209,11 +17208,11 @@ mod __parse__Top { assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1675::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17228,12 +17227,12 @@ mod __parse__Top { assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1676::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17248,13 +17247,13 @@ mod __parse__Top { assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1677::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17269,13 +17268,13 @@ mod __parse__Top { assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1678::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17290,14 +17289,14 @@ mod __parse__Top { assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); let __sym8 = __pop_Variant28(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1679::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -17314,7 +17313,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1680::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -17332,7 +17331,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1681::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -17351,7 +17350,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1682::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17371,7 +17370,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1683::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17391,7 +17390,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1684::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17412,7 +17411,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1685::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17426,7 +17425,7 @@ mod __parse__Top { // ParameterList = ParameterDef, "," => ActionFn(1686); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = match super::__action1686::<>(__sym0, __sym1) { @@ -17441,7 +17440,7 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = match super::__action1687::<>(__sym0, __sym1, __sym2) { @@ -17457,7 +17456,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1688::<>(__sym0, __sym1, __sym2, __sym3) { @@ -17474,7 +17473,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1689::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -17491,7 +17490,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1690::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -17509,7 +17508,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1691::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -17522,12 +17521,12 @@ mod __parse__Top { 728 => { // ParameterList = ParameterDef, ",", "*", StarTypedParameter, ",", KwargParameter => ActionFn(1692); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1692::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -17540,13 +17539,13 @@ mod __parse__Top { 729 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", StarTypedParameter, ",", KwargParameter => ActionFn(1693); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1693::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17559,14 +17558,14 @@ mod __parse__Top { 730 => { // ParameterList = ParameterDef, ",", "/", ",", "*", StarTypedParameter, ",", KwargParameter => ActionFn(1694); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1694::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17579,15 +17578,15 @@ mod __parse__Top { 731 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", StarTypedParameter, ",", KwargParameter => ActionFn(1695); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1695::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17600,15 +17599,15 @@ mod __parse__Top { 732 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ",", KwargParameter => ActionFn(1696); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1696::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17621,16 +17620,16 @@ mod __parse__Top { 733 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ",", KwargParameter => ActionFn(1697); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1697::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -17643,11 +17642,11 @@ mod __parse__Top { 734 => { // ParameterList = ParameterDef, ",", "*", ",", KwargParameter => ActionFn(1698); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1698::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -17660,12 +17659,12 @@ mod __parse__Top { 735 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", ",", KwargParameter => ActionFn(1699); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1699::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -17678,13 +17677,13 @@ mod __parse__Top { 736 => { // ParameterList = ParameterDef, ",", "/", ",", "*", ",", KwargParameter => ActionFn(1700); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1700::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17697,14 +17696,14 @@ mod __parse__Top { 737 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", ",", KwargParameter => ActionFn(1701); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1701::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17717,14 +17716,14 @@ mod __parse__Top { 738 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", ",", KwargParameter => ActionFn(1702); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1702::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17737,7 +17736,7 @@ mod __parse__Top { 739 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", ",", KwargParameter => ActionFn(1703); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -17745,7 +17744,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1703::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17758,13 +17757,13 @@ mod __parse__Top { 740 => { // ParameterList = ParameterDef, ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1704); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1704::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17777,14 +17776,14 @@ mod __parse__Top { 741 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1705); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1705::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17797,15 +17796,15 @@ mod __parse__Top { 742 => { // ParameterList = ParameterDef, ",", "/", ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1706); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1706::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17818,16 +17817,16 @@ mod __parse__Top { 743 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1707); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1707::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -17840,16 +17839,16 @@ mod __parse__Top { 744 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1708); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1708::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -17862,17 +17861,17 @@ mod __parse__Top { 745 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1709); assert!(__symbols.len() >= 11); - let __sym10 = __pop_Variant84(__symbols); + let __sym10 = __pop_Variant83(__symbols); let __sym9 = __pop_Variant0(__symbols); let __sym8 = __pop_Variant28(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1709::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -17885,12 +17884,12 @@ mod __parse__Top { 746 => { // ParameterList = ParameterDef, ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1710); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1710::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -17903,13 +17902,13 @@ mod __parse__Top { 747 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1711); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1711::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -17922,14 +17921,14 @@ mod __parse__Top { 748 => { // ParameterList = ParameterDef, ",", "/", ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1712); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1712::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -17942,7 +17941,7 @@ mod __parse__Top { 749 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1713); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -17950,7 +17949,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1713::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17963,7 +17962,7 @@ mod __parse__Top { 750 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1714); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -17971,7 +17970,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1714::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -17984,7 +17983,7 @@ mod __parse__Top { 751 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1715); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); let __sym6 = __pop_Variant0(__symbols); @@ -17993,7 +17992,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1715::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -18006,10 +18005,10 @@ mod __parse__Top { 752 => { // ParameterList = ParameterDef, ",", "*", StarTypedParameter => ActionFn(1716); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1716::<>(__sym0, __sym1, __sym2, __sym3) { @@ -18022,11 +18021,11 @@ mod __parse__Top { 753 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", StarTypedParameter => ActionFn(1717); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1717::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -18039,12 +18038,12 @@ mod __parse__Top { 754 => { // ParameterList = ParameterDef, ",", "/", ",", "*", StarTypedParameter => ActionFn(1718); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1718::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -18057,13 +18056,13 @@ mod __parse__Top { 755 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", StarTypedParameter => ActionFn(1719); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1719::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18076,13 +18075,13 @@ mod __parse__Top { 756 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter => ActionFn(1720); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1720::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18095,14 +18094,14 @@ mod __parse__Top { 757 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter => ActionFn(1721); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1721::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -18117,7 +18116,7 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = match super::__action1722::<>(__sym0, __sym1, __sym2) { @@ -18133,7 +18132,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1723::<>(__sym0, __sym1, __sym2, __sym3) { @@ -18150,7 +18149,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1724::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -18168,7 +18167,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1725::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -18186,7 +18185,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1726::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -18205,7 +18204,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1727::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18219,10 +18218,10 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1728); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant28(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1728::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -18236,11 +18235,11 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1729); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant28(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1729::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -18254,12 +18253,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1730); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant28(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1730::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18273,13 +18272,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1731); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1731::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -18293,13 +18292,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1732); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1732::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -18313,14 +18312,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1733); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant28(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1733::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -18336,7 +18335,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1734::<>(__sym0, __sym1, __sym2, __sym3) { @@ -18353,7 +18352,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1735::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -18371,7 +18370,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1736::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -18390,7 +18389,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1737::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18409,7 +18408,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1738::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18429,7 +18428,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1739::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -18441,7 +18440,7 @@ mod __parse__Top { } 776 => { // ParameterList = ParameterDef => ActionFn(1740); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = match super::__action1740::<>(__sym0) { @@ -18455,7 +18454,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+ => ActionFn(1741); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = match super::__action1741::<>(__sym0, __sym1) { @@ -18470,7 +18469,7 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = match super::__action1742::<>(__sym0, __sym1, __sym2) { @@ -18486,7 +18485,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1743::<>(__sym0, __sym1, __sym2, __sym3) { @@ -18502,7 +18501,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1744::<>(__sym0, __sym1, __sym2, __sym3) { @@ -18519,7 +18518,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1745::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -18533,9 +18532,9 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", KwargParameter, "," => ActionFn(1746); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1746::<>(__sym0, __sym1, __sym2, __sym3) { @@ -18549,10 +18548,10 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1747); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1747::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -18566,11 +18565,11 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", KwargParameter, "," => ActionFn(1748); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1748::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -18584,12 +18583,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", KwargParameter, "," => ActionFn(1749); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1749::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18603,12 +18602,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1750); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1750::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18622,13 +18621,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1751); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1751::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -18641,9 +18640,9 @@ mod __parse__Top { 788 => { // ParameterList = ParameterDef, ",", KwargParameter => ActionFn(1752); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = match super::__action1752::<>(__sym0, __sym1, __sym2) { @@ -18656,10 +18655,10 @@ mod __parse__Top { 789 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1753); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1753::<>(__sym0, __sym1, __sym2, __sym3) { @@ -18672,11 +18671,11 @@ mod __parse__Top { 790 => { // ParameterList = ParameterDef, ",", "/", ",", KwargParameter => ActionFn(1754); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1754::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -18689,12 +18688,12 @@ mod __parse__Top { 791 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", KwargParameter => ActionFn(1755); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1755::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -18707,12 +18706,12 @@ mod __parse__Top { 792 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1756); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1756::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -18725,13 +18724,13 @@ mod __parse__Top { 793 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1757); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1757::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -18745,9 +18744,9 @@ mod __parse__Top { // ParameterList = "*", StarTypedParameter, ",", KwargParameter, "," => ActionFn(1210); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; @@ -18762,7 +18761,7 @@ mod __parse__Top { // ParameterList = "*", ",", KwargParameter, "," => ActionFn(1211); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -18778,10 +18777,10 @@ mod __parse__Top { // ParameterList = "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1212); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym5.2; @@ -18796,7 +18795,7 @@ mod __parse__Top { // ParameterList = "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1213); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -18813,7 +18812,7 @@ mod __parse__Top { // ParameterList = "*", StarTypedParameter, "," => ActionFn(1214); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -18843,7 +18842,7 @@ mod __parse__Top { assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -18872,9 +18871,9 @@ mod __parse__Top { 802 => { // ParameterList = "*", StarTypedParameter, ",", KwargParameter => ActionFn(1218); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -18888,7 +18887,7 @@ mod __parse__Top { 803 => { // ParameterList = "*", ",", KwargParameter => ActionFn(1219); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -18903,10 +18902,10 @@ mod __parse__Top { 804 => { // ParameterList = "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1220); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; @@ -18920,7 +18919,7 @@ mod __parse__Top { 805 => { // ParameterList = "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1221); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -18936,7 +18935,7 @@ mod __parse__Top { 806 => { // ParameterList = "*", StarTypedParameter => ActionFn(1222); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -18963,7 +18962,7 @@ mod __parse__Top { // ParameterList = "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1224); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -18998,12 +18997,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", UntypedParameter, ",", KwargParameter, "," => ActionFn(1758); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1758::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -19017,13 +19016,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", UntypedParameter, ",", KwargParameter, "," => ActionFn(1759); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1759::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19037,14 +19036,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", UntypedParameter, ",", KwargParameter, "," => ActionFn(1760); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1760::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19058,15 +19057,15 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", UntypedParameter, ",", KwargParameter, "," => ActionFn(1761); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1761::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -19080,15 +19079,15 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ",", KwargParameter, "," => ActionFn(1762); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1762::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -19102,16 +19101,16 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ",", KwargParameter, "," => ActionFn(1763); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1763::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -19125,11 +19124,11 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", ",", KwargParameter, "," => ActionFn(1764); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1764::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -19143,12 +19142,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", ",", KwargParameter, "," => ActionFn(1765); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1765::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -19162,13 +19161,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", ",", KwargParameter, "," => ActionFn(1766); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1766::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19182,14 +19181,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", ",", KwargParameter, "," => ActionFn(1767); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1767::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19203,14 +19202,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", ",", KwargParameter, "," => ActionFn(1768); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1768::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19224,7 +19223,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", ",", KwargParameter, "," => ActionFn(1769); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -19232,7 +19231,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1769::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -19246,13 +19245,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1770); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1770::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19266,14 +19265,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1771); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1771::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19287,15 +19286,15 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1772); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1772::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -19309,16 +19308,16 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1773); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1773::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -19332,16 +19331,16 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1774); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1774::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -19355,17 +19354,17 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1775); assert!(__symbols.len() >= 12); let __sym11 = __pop_Variant0(__symbols); - let __sym10 = __pop_Variant84(__symbols); + let __sym10 = __pop_Variant83(__symbols); let __sym9 = __pop_Variant0(__symbols); let __sym8 = __pop_Variant28(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym11.2; let __nt = match super::__action1775::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10, __sym11) { @@ -19379,12 +19378,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1776); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1776::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -19398,13 +19397,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1777); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1777::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19418,14 +19417,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1778); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1778::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19439,7 +19438,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1779); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -19447,7 +19446,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1779::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -19461,7 +19460,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1780); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -19469,7 +19468,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1780::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -19483,7 +19482,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1781); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); let __sym6 = __pop_Variant0(__symbols); @@ -19492,7 +19491,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1781::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -19506,10 +19505,10 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", UntypedParameter, "," => ActionFn(1782); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1782::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -19523,11 +19522,11 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", UntypedParameter, "," => ActionFn(1783); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1783::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -19541,12 +19540,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", UntypedParameter, "," => ActionFn(1784); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1784::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -19560,13 +19559,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", UntypedParameter, "," => ActionFn(1785); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1785::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19580,13 +19579,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, "," => ActionFn(1786); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1786::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19600,14 +19599,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, "," => ActionFn(1787); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1787::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19623,7 +19622,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1788::<>(__sym0, __sym1, __sym2, __sym3) { @@ -19640,7 +19639,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1789::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -19658,7 +19657,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1790::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -19677,7 +19676,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1791::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -19696,7 +19695,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1792::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -19716,7 +19715,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1793::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19731,10 +19730,10 @@ mod __parse__Top { assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1794::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -19749,11 +19748,11 @@ mod __parse__Top { assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1795::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -19768,12 +19767,12 @@ mod __parse__Top { assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1796::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19788,13 +19787,13 @@ mod __parse__Top { assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1797::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19809,13 +19808,13 @@ mod __parse__Top { assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1798::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19830,14 +19829,14 @@ mod __parse__Top { assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); let __sym8 = __pop_Variant28(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1799::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -19854,7 +19853,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1800::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -19872,7 +19871,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1801::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -19891,7 +19890,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1802::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -19911,7 +19910,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1803::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19931,7 +19930,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1804::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -19952,7 +19951,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1805::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -19966,7 +19965,7 @@ mod __parse__Top { // ParameterList = ParameterDef, "," => ActionFn(1806); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = match super::__action1806::<>(__sym0, __sym1) { @@ -19981,7 +19980,7 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = match super::__action1807::<>(__sym0, __sym1, __sym2) { @@ -19997,7 +19996,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1808::<>(__sym0, __sym1, __sym2, __sym3) { @@ -20014,7 +20013,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1809::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -20031,7 +20030,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1810::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -20049,7 +20048,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1811::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20062,12 +20061,12 @@ mod __parse__Top { 866 => { // ParameterList = ParameterDef, ",", "*", UntypedParameter, ",", KwargParameter => ActionFn(1812); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1812::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20080,13 +20079,13 @@ mod __parse__Top { 867 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", UntypedParameter, ",", KwargParameter => ActionFn(1813); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1813::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20099,14 +20098,14 @@ mod __parse__Top { 868 => { // ParameterList = ParameterDef, ",", "/", ",", "*", UntypedParameter, ",", KwargParameter => ActionFn(1814); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1814::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20119,15 +20118,15 @@ mod __parse__Top { 869 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", UntypedParameter, ",", KwargParameter => ActionFn(1815); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1815::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -20140,15 +20139,15 @@ mod __parse__Top { 870 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ",", KwargParameter => ActionFn(1816); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1816::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -20161,16 +20160,16 @@ mod __parse__Top { 871 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ",", KwargParameter => ActionFn(1817); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1817::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -20183,11 +20182,11 @@ mod __parse__Top { 872 => { // ParameterList = ParameterDef, ",", "*", ",", KwargParameter => ActionFn(1818); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1818::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -20200,12 +20199,12 @@ mod __parse__Top { 873 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", ",", KwargParameter => ActionFn(1819); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1819::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20218,13 +20217,13 @@ mod __parse__Top { 874 => { // ParameterList = ParameterDef, ",", "/", ",", "*", ",", KwargParameter => ActionFn(1820); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1820::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20237,14 +20236,14 @@ mod __parse__Top { 875 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", ",", KwargParameter => ActionFn(1821); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1821::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20257,14 +20256,14 @@ mod __parse__Top { 876 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", ",", KwargParameter => ActionFn(1822); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1822::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20277,7 +20276,7 @@ mod __parse__Top { 877 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", ",", KwargParameter => ActionFn(1823); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -20285,7 +20284,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1823::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -20298,13 +20297,13 @@ mod __parse__Top { 878 => { // ParameterList = ParameterDef, ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1824); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1824::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20317,14 +20316,14 @@ mod __parse__Top { 879 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1825); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1825::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20337,15 +20336,15 @@ mod __parse__Top { 880 => { // ParameterList = ParameterDef, ",", "/", ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1826); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1826::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -20358,16 +20357,16 @@ mod __parse__Top { 881 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1827); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1827::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -20380,16 +20379,16 @@ mod __parse__Top { 882 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1828); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1828::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -20402,17 +20401,17 @@ mod __parse__Top { 883 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1829); assert!(__symbols.len() >= 11); - let __sym10 = __pop_Variant84(__symbols); + let __sym10 = __pop_Variant83(__symbols); let __sym9 = __pop_Variant0(__symbols); let __sym8 = __pop_Variant28(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym10.2; let __nt = match super::__action1829::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9, __sym10) { @@ -20425,12 +20424,12 @@ mod __parse__Top { 884 => { // ParameterList = ParameterDef, ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1830); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1830::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20443,13 +20442,13 @@ mod __parse__Top { 885 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1831); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1831::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20462,14 +20461,14 @@ mod __parse__Top { 886 => { // ParameterList = ParameterDef, ",", "/", ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1832); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant84(__symbols); + let __sym7 = __pop_Variant83(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant28(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1832::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20482,7 +20481,7 @@ mod __parse__Top { 887 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1833); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -20490,7 +20489,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1833::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -20503,7 +20502,7 @@ mod __parse__Top { 888 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1834); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant84(__symbols); + let __sym8 = __pop_Variant83(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant28(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -20511,7 +20510,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1834::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -20524,7 +20523,7 @@ mod __parse__Top { 889 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1835); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant84(__symbols); + let __sym9 = __pop_Variant83(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant28(__symbols); let __sym6 = __pop_Variant0(__symbols); @@ -20533,7 +20532,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym9.2; let __nt = match super::__action1835::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8, __sym9) { @@ -20546,10 +20545,10 @@ mod __parse__Top { 890 => { // ParameterList = ParameterDef, ",", "*", UntypedParameter => ActionFn(1836); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1836::<>(__sym0, __sym1, __sym2, __sym3) { @@ -20562,11 +20561,11 @@ mod __parse__Top { 891 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", UntypedParameter => ActionFn(1837); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1837::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -20579,12 +20578,12 @@ mod __parse__Top { 892 => { // ParameterList = ParameterDef, ",", "/", ",", "*", UntypedParameter => ActionFn(1838); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1838::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20597,13 +20596,13 @@ mod __parse__Top { 893 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", UntypedParameter => ActionFn(1839); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1839::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20616,13 +20615,13 @@ mod __parse__Top { 894 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter => ActionFn(1840); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1840::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20635,14 +20634,14 @@ mod __parse__Top { 895 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter => ActionFn(1841); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1841::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20657,7 +20656,7 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = match super::__action1842::<>(__sym0, __sym1, __sym2) { @@ -20673,7 +20672,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1843::<>(__sym0, __sym1, __sym2, __sym3) { @@ -20690,7 +20689,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1844::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -20708,7 +20707,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1845::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20726,7 +20725,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1846::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20745,7 +20744,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1847::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20759,10 +20758,10 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1848); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant28(__symbols); - let __sym3 = __pop_Variant101(__symbols); + let __sym3 = __pop_Variant100(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1848::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -20776,11 +20775,11 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1849); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant28(__symbols); - let __sym4 = __pop_Variant101(__symbols); + let __sym4 = __pop_Variant100(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1849::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20794,12 +20793,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1850); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant28(__symbols); - let __sym5 = __pop_Variant101(__symbols); + let __sym5 = __pop_Variant100(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1850::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20813,13 +20812,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1851); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1851::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20833,13 +20832,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1852); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant28(__symbols); - let __sym6 = __pop_Variant101(__symbols); + let __sym6 = __pop_Variant100(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1852::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20853,14 +20852,14 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1853); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant28(__symbols); - let __sym7 = __pop_Variant101(__symbols); + let __sym7 = __pop_Variant100(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym8.2; let __nt = match super::__action1853::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8) { @@ -20876,7 +20875,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1854::<>(__sym0, __sym1, __sym2, __sym3) { @@ -20893,7 +20892,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1855::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -20911,7 +20910,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1856::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -20930,7 +20929,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1857::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20949,7 +20948,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1858::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -20969,7 +20968,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1859::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -20981,7 +20980,7 @@ mod __parse__Top { } 914 => { // ParameterList = ParameterDef => ActionFn(1860); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = match super::__action1860::<>(__sym0) { @@ -20995,7 +20994,7 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+ => ActionFn(1861); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = match super::__action1861::<>(__sym0, __sym1) { @@ -21010,7 +21009,7 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = match super::__action1862::<>(__sym0, __sym1, __sym2) { @@ -21026,7 +21025,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1863::<>(__sym0, __sym1, __sym2, __sym3) { @@ -21042,7 +21041,7 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1864::<>(__sym0, __sym1, __sym2, __sym3) { @@ -21059,7 +21058,7 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1865::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -21073,9 +21072,9 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", KwargParameter, "," => ActionFn(1866); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1866::<>(__sym0, __sym1, __sym2, __sym3) { @@ -21089,10 +21088,10 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1867); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1867::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -21106,11 +21105,11 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ",", KwargParameter, "," => ActionFn(1868); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1868::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -21124,12 +21123,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", KwargParameter, "," => ActionFn(1869); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1869::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -21143,12 +21142,12 @@ mod __parse__Top { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1870); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1870::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -21162,13 +21161,13 @@ mod __parse__Top { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1871); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = match super::__action1871::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7) { @@ -21181,9 +21180,9 @@ mod __parse__Top { 926 => { // ParameterList = ParameterDef, ",", KwargParameter => ActionFn(1872); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = match super::__action1872::<>(__sym0, __sym1, __sym2) { @@ -21196,10 +21195,10 @@ mod __parse__Top { 927 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1873); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = match super::__action1873::<>(__sym0, __sym1, __sym2, __sym3) { @@ -21212,11 +21211,11 @@ mod __parse__Top { 928 => { // ParameterList = ParameterDef, ",", "/", ",", KwargParameter => ActionFn(1874); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = match super::__action1874::<>(__sym0, __sym1, __sym2, __sym3, __sym4) { @@ -21229,12 +21228,12 @@ mod __parse__Top { 929 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ",", KwargParameter => ActionFn(1875); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1875::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -21247,12 +21246,12 @@ mod __parse__Top { 930 => { // ParameterList = ParameterDef, ",", "/", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1876); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant84(__symbols); + let __sym5 = __pop_Variant83(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = match super::__action1876::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5) { @@ -21265,13 +21264,13 @@ mod __parse__Top { 931 => { // ParameterList = ParameterDef, ("," ParameterDef)+, ",", "/", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1877); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant84(__symbols); + let __sym6 = __pop_Variant83(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant28(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = match super::__action1877::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6) { @@ -21285,9 +21284,9 @@ mod __parse__Top { // ParameterList = "*", UntypedParameter, ",", KwargParameter, "," => ActionFn(1270); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; @@ -21302,7 +21301,7 @@ mod __parse__Top { // ParameterList = "*", ",", KwargParameter, "," => ActionFn(1271); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -21318,10 +21317,10 @@ mod __parse__Top { // ParameterList = "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1272); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym5.2; @@ -21336,7 +21335,7 @@ mod __parse__Top { // ParameterList = "*", ("," ParameterDef)+, ",", KwargParameter, "," => ActionFn(1273); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -21353,7 +21352,7 @@ mod __parse__Top { // ParameterList = "*", UntypedParameter, "," => ActionFn(1274); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -21383,7 +21382,7 @@ mod __parse__Top { assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -21412,9 +21411,9 @@ mod __parse__Top { 940 => { // ParameterList = "*", UntypedParameter, ",", KwargParameter => ActionFn(1278); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -21428,7 +21427,7 @@ mod __parse__Top { 941 => { // ParameterList = "*", ",", KwargParameter => ActionFn(1279); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -21443,10 +21442,10 @@ mod __parse__Top { 942 => { // ParameterList = "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1280); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; @@ -21460,7 +21459,7 @@ mod __parse__Top { 943 => { // ParameterList = "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1281); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -21476,7 +21475,7 @@ mod __parse__Top { 944 => { // ParameterList = "*", UntypedParameter => ActionFn(1282); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -21503,7 +21502,7 @@ mod __parse__Top { // ParameterList = "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1284); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -21543,9 +21542,9 @@ mod __parse__Top { 952 => { // ParameterListStarArgs = "*", StarTypedParameter, ",", KwargParameter => ActionFn(1194); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -21553,13 +21552,13 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (4, 243) } 953 => { // ParameterListStarArgs = "*", ",", KwargParameter => ActionFn(1195); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -21568,16 +21567,16 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (3, 243) } 954 => { // ParameterListStarArgs = "*", StarTypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1196); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; @@ -21585,13 +21584,13 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (5, 243) } 955 => { // ParameterListStarArgs = "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1197); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -21601,13 +21600,13 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (4, 243) } 956 => { // ParameterListStarArgs = "*", StarTypedParameter => ActionFn(1198); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -21615,7 +21614,7 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (2, 243) } 957 => { @@ -21627,14 +21626,14 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (1, 243) } 958 => { // ParameterListStarArgs = "*", StarTypedParameter, ("," ParameterDef)+ => ActionFn(1200); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -21642,7 +21641,7 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (3, 243) } 959 => { @@ -21656,15 +21655,15 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (2, 243) } 960 => { // ParameterListStarArgs = "*", UntypedParameter, ",", KwargParameter => ActionFn(1254); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -21672,13 +21671,13 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (4, 244) } 961 => { // ParameterListStarArgs = "*", ",", KwargParameter => ActionFn(1255); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant84(__symbols); + let __sym2 = __pop_Variant83(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -21687,16 +21686,16 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (3, 244) } 962 => { // ParameterListStarArgs = "*", UntypedParameter, ("," ParameterDef)+, ",", KwargParameter => ActionFn(1256); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant84(__symbols); + let __sym4 = __pop_Variant83(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; @@ -21704,13 +21703,13 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (5, 244) } 963 => { // ParameterListStarArgs = "*", ("," ParameterDef)+, ",", KwargParameter => ActionFn(1257); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant84(__symbols); + let __sym3 = __pop_Variant83(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -21720,13 +21719,13 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (4, 244) } 964 => { // ParameterListStarArgs = "*", UntypedParameter => ActionFn(1258); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -21734,7 +21733,7 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (2, 244) } 965 => { @@ -21746,14 +21745,14 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (1, 244) } 966 => { // ParameterListStarArgs = "*", UntypedParameter, ("," ParameterDef)+ => ActionFn(1260); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant28(__symbols); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -21761,7 +21760,7 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (3, 244) } 967 => { @@ -21775,7 +21774,7 @@ mod __parse__Top { Ok(v) => v, Err(e) => return Some(Err(e)), }; - __symbols.push((__start, __Symbol::Variant95(__nt), __end)); + __symbols.push((__start, __Symbol::Variant94(__nt), __end)); (2, 244) } 968 => { @@ -22316,7 +22315,7 @@ mod __parse__Top { } 1139 => { // __Top = Top => ActionFn(0); - let __sym0 = __pop_Variant103(__symbols); + let __sym0 = __pop_Variant102(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action0::<>(__sym0); @@ -22345,33 +22344,33 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant95< + fn __pop_Variant94< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, (Option>, Vec, Vec, Option>), TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant95(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant94(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant69< + fn __pop_Variant68< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, (Option>, ast::Expr), TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant69(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant68(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant83< + fn __pop_Variant82< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, (Option, Option), TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant83(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant82(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22405,23 +22404,23 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant94< + fn __pop_Variant93< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, (Vec<(ast::Arg, Option)>, Vec<(ast::Arg, Option)>), TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant94(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant93(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant93< + fn __pop_Variant92< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, (ast::Arg, Option), TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant93(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant92(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22435,23 +22434,23 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant70< + fn __pop_Variant69< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, (ast::Expr, ast::Expr), TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant70(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant69(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant88< + fn __pop_Variant87< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, (ast::Expr, ast::Pattern), TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant88(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant87(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22465,13 +22464,13 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant87< + fn __pop_Variant86< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, (ast::Identifier, ast::Pattern), TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant87(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant86(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22635,23 +22634,23 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant84< + fn __pop_Variant83< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, Option>, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant84(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant83(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant99< + fn __pop_Variant98< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, Option, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant99(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant98(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22675,40 +22674,30 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant63< + fn __pop_Variant62< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, Vec<(Option<(TextSize, TextSize, Option)>, ast::Expr)>, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant63(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant62(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant71< + fn __pop_Variant70< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, Vec<(Option>, ast::Expr)>, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant71(__v), __r)) => (__l, __v, __r), - _ => __symbol_type_mismatch() - } - } - fn __pop_Variant92< - >( - __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> - ) -> (TextSize, Vec<(ast::Arg, Option)>, TextSize) - { - match __symbols.pop() { - Some((__l, __Symbol::Variant92(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant70(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } fn __pop_Variant91< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> - ) -> (TextSize, Vec<(ast::Expr, ast::Pattern)>, TextSize) + ) -> (TextSize, Vec<(ast::Arg, Option)>, TextSize) { match __symbols.pop() { Some((__l, __Symbol::Variant91(__v), __r)) => (__l, __v, __r), @@ -22718,30 +22707,40 @@ mod __parse__Top { fn __pop_Variant90< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> - ) -> (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize) + ) -> (TextSize, Vec<(ast::Expr, ast::Pattern)>, TextSize) { match __symbols.pop() { Some((__l, __Symbol::Variant90(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant80< + fn __pop_Variant89< + >( + __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> + ) -> (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize) + { + match __symbols.pop() { + Some((__l, __Symbol::Variant89(__v), __r)) => (__l, __v, __r), + _ => __symbol_type_mismatch() + } + } + fn __pop_Variant79< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant80(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant79(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant65< + fn __pop_Variant64< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant65(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant64(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22755,23 +22754,23 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant89< + fn __pop_Variant88< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant89(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant88(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant64< + fn __pop_Variant63< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant64(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant63(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22915,23 +22914,23 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant98< + fn __pop_Variant97< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, alloc::vec::Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant98(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant97(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant75< + fn __pop_Variant74< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, alloc::vec::Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant75(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant74(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22945,23 +22944,23 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant82< + fn __pop_Variant81< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, alloc::vec::Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant82(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant81(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant86< + fn __pop_Variant85< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, alloc::vec::Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant86(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant85(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -22975,13 +22974,13 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant77< + fn __pop_Variant76< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, alloc::vec::Vec, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant77(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant76(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23005,23 +23004,23 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant79< + fn __pop_Variant78< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Alias, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant79(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant78(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant101< + fn __pop_Variant100< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Arg, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant101(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant100(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23035,43 +23034,43 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant67< + fn __pop_Variant66< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Cmpop, TextSize) + { + match __symbols.pop() { + Some((__l, __Symbol::Variant66(__v), __r)) => (__l, __v, __r), + _ => __symbol_type_mismatch() + } + } + fn __pop_Variant96< + >( + __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> + ) -> (TextSize, ast::Comprehension, TextSize) + { + match __symbols.pop() { + Some((__l, __Symbol::Variant96(__v), __r)) => (__l, __v, __r), + _ => __symbol_type_mismatch() + } + } + fn __pop_Variant67< + >( + __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> + ) -> (TextSize, ast::Constant, TextSize) { match __symbols.pop() { Some((__l, __Symbol::Variant67(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant97< - >( - __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> - ) -> (TextSize, ast::Comprehension, TextSize) - { - match __symbols.pop() { - Some((__l, __Symbol::Variant97(__v), __r)) => (__l, __v, __r), - _ => __symbol_type_mismatch() - } - } - fn __pop_Variant68< - >( - __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> - ) -> (TextSize, ast::Constant, TextSize) - { - match __symbols.pop() { - Some((__l, __Symbol::Variant68(__v), __r)) => (__l, __v, __r), - _ => __symbol_type_mismatch() - } - } - fn __pop_Variant74< + fn __pop_Variant73< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Excepthandler, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant74(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant73(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23085,43 +23084,43 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant73< + fn __pop_Variant72< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Identifier, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant73(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant72(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant81< + fn __pop_Variant80< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Int, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant81(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant80(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant85< + fn __pop_Variant84< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::MatchCase, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant85(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant84(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant103< + fn __pop_Variant102< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Mod, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant103(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant102(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23145,16 +23144,6 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant62< - >( - __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> - ) -> (TextSize, ast::PatternKind, TextSize) - { - match __symbols.pop() { - Some((__l, __Symbol::Variant62(__v), __r)) => (__l, __v, __r), - _ => __symbol_type_mismatch() - } - } fn __pop_Variant61< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> @@ -23165,23 +23154,23 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant76< + fn __pop_Variant75< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Suite, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant76(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant75(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant104< + fn __pop_Variant103< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, ast::Unaryop, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant104(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant103(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23195,13 +23184,13 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant78< + fn __pop_Variant77< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, core::option::Option<(Option<(TextSize, TextSize, Option)>, ast::Expr)>, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant78(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant77(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23265,33 +23254,33 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant100< + fn __pop_Variant99< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, core::option::Option>, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant100(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant99(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant72< + fn __pop_Variant71< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, core::option::Option>, ast::Expr)>>, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant72(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant71(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } - fn __pop_Variant66< + fn __pop_Variant65< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, core::option::Option>, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant66(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant65(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23315,13 +23304,13 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant102< + fn __pop_Variant101< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, core::option::Option, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant102(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant101(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23345,13 +23334,13 @@ mod __parse__Top { _ => __symbol_type_mismatch() } } - fn __pop_Variant96< + fn __pop_Variant95< >( __symbols: &mut alloc::vec::Vec<(TextSize,__Symbol<>,TextSize)> ) -> (TextSize, core::option::Option, TextSize) { match __symbols.pop() { - Some((__l, __Symbol::Variant96(__v), __r)) => (__l, __v, __r), + Some((__l, __Symbol::Variant95(__v), __r)) => (__l, __v, __r), _ => __symbol_type_mismatch() } } @@ -23693,7 +23682,7 @@ mod __parse__Top { { // ("," DictElement) = ",", DictElement => ActionFn(422); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant69(__symbols); + let __sym1 = __pop_Variant68(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -23739,7 +23728,7 @@ mod __parse__Top { { // ("," DictElement)+ = ",", DictElement => ActionFn(696); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant69(__symbols); + let __sym1 = __pop_Variant68(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -23756,7 +23745,7 @@ mod __parse__Top { { // ("," DictElement)+ = ("," DictElement)+, ",", DictElement => ActionFn(697); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant69(__symbols); + let __sym2 = __pop_Variant68(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant14(__symbols); let __start = __sym0.0; @@ -23855,7 +23844,7 @@ mod __parse__Top { { // ("," Identifier) = ",", Identifier => ActionFn(375); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -23901,7 +23890,7 @@ mod __parse__Top { { // ("," Identifier)+ = ",", Identifier => ActionFn(704); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -23918,7 +23907,7 @@ mod __parse__Top { { // ("," Identifier)+ = ("," Identifier)+, ",", Identifier => ActionFn(705); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant18(__symbols); let __start = __sym0.0; @@ -23936,9 +23925,9 @@ mod __parse__Top { { // ("," ImportAsAlias) = ",", DottedName, "as", Identifier => ActionFn(1132); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -23955,7 +23944,7 @@ mod __parse__Top { { // ("," ImportAsAlias) = ",", DottedName => ActionFn(1133); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24001,9 +23990,9 @@ mod __parse__Top { { // ("," ImportAsAlias)+ = ",", DottedName, "as", Identifier => ActionFn(1136); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -24020,7 +24009,7 @@ mod __parse__Top { { // ("," ImportAsAlias)+ = ",", DottedName => ActionFn(1137); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24037,9 +24026,9 @@ mod __parse__Top { { // ("," ImportAsAlias)+ = ("," ImportAsAlias)+, ",", DottedName, "as", Identifier => ActionFn(1138); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant73(__symbols); + let __sym4 = __pop_Variant72(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant20(__symbols); let __start = __sym0.0; @@ -24057,7 +24046,7 @@ mod __parse__Top { { // ("," ImportAsAlias)+ = ("," ImportAsAlias)+, ",", DottedName => ActionFn(1139); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant20(__symbols); let __start = __sym0.0; @@ -24075,9 +24064,9 @@ mod __parse__Top { { // ("," ImportAsAlias) = ",", Identifier, "as", Identifier => ActionFn(1144); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -24094,7 +24083,7 @@ mod __parse__Top { { // ("," ImportAsAlias) = ",", Identifier => ActionFn(1145); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24140,9 +24129,9 @@ mod __parse__Top { { // ("," ImportAsAlias)+ = ",", Identifier, "as", Identifier => ActionFn(1148); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -24159,7 +24148,7 @@ mod __parse__Top { { // ("," ImportAsAlias)+ = ",", Identifier => ActionFn(1149); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24176,9 +24165,9 @@ mod __parse__Top { { // ("," ImportAsAlias)+ = ("," ImportAsAlias)+, ",", Identifier, "as", Identifier => ActionFn(1150); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant73(__symbols); + let __sym4 = __pop_Variant72(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant20(__symbols); let __start = __sym0.0; @@ -24196,7 +24185,7 @@ mod __parse__Top { { // ("," ImportAsAlias)+ = ("," ImportAsAlias)+, ",", Identifier => ActionFn(1151); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant20(__symbols); let __start = __sym0.0; @@ -24214,7 +24203,7 @@ mod __parse__Top { { // ("," KwargParameter) = ",", KwargParameter => ActionFn(402); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant84(__symbols); + let __sym1 = __pop_Variant83(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24231,7 +24220,7 @@ mod __parse__Top { { // ("," KwargParameter)? = ",", KwargParameter => ActionFn(1156); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant84(__symbols); + let __sym1 = __pop_Variant83(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24262,7 +24251,7 @@ mod __parse__Top { { // ("," KwargParameter) = ",", KwargParameter => ActionFn(410); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant84(__symbols); + let __sym1 = __pop_Variant83(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24279,7 +24268,7 @@ mod __parse__Top { { // ("," KwargParameter)? = ",", KwargParameter => ActionFn(1161); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant84(__symbols); + let __sym1 = __pop_Variant83(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24310,7 +24299,7 @@ mod __parse__Top { { // ("," MatchKeywordEntry) = ",", MatchKeywordEntry => ActionFn(392); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant87(__symbols); + let __sym1 = __pop_Variant86(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24356,7 +24345,7 @@ mod __parse__Top { { // ("," MatchKeywordEntry)+ = ",", MatchKeywordEntry => ActionFn(1166); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant87(__symbols); + let __sym1 = __pop_Variant86(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24373,7 +24362,7 @@ mod __parse__Top { { // ("," MatchKeywordEntry)+ = ("," MatchKeywordEntry)+, ",", MatchKeywordEntry => ActionFn(1167); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant24(__symbols); let __start = __sym0.0; @@ -24391,7 +24380,7 @@ mod __parse__Top { { // ("," MatchMappingEntry) = ",", MatchMappingEntry => ActionFn(389); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24437,7 +24426,7 @@ mod __parse__Top { { // ("," MatchMappingEntry)+ = ",", MatchMappingEntry => ActionFn(1170); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24454,7 +24443,7 @@ mod __parse__Top { { // ("," MatchMappingEntry)+ = ("," MatchMappingEntry)+, ",", MatchMappingEntry => ActionFn(1171); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant88(__symbols); + let __sym2 = __pop_Variant87(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant26(__symbols); let __start = __sym0.0; @@ -24472,7 +24461,7 @@ mod __parse__Top { { // ("," ParameterDef) = ",", ParameterDef => ActionFn(472); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant93(__symbols); + let __sym1 = __pop_Variant92(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24518,7 +24507,7 @@ mod __parse__Top { { // ("," ParameterDef)+ = ",", ParameterDef => ActionFn(1174); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant93(__symbols); + let __sym1 = __pop_Variant92(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24535,7 +24524,7 @@ mod __parse__Top { { // ("," ParameterDef)+ = ("," ParameterDef)+, ",", ParameterDef => ActionFn(1175); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant93(__symbols); + let __sym2 = __pop_Variant92(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant28(__symbols); let __start = __sym0.0; @@ -24553,7 +24542,7 @@ mod __parse__Top { { // ("," ParameterDef) = ",", ParameterDef => ActionFn(462); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant93(__symbols); + let __sym1 = __pop_Variant92(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24599,7 +24588,7 @@ mod __parse__Top { { // ("," ParameterDef)+ = ",", ParameterDef => ActionFn(1184); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant93(__symbols); + let __sym1 = __pop_Variant92(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -24616,7 +24605,7 @@ mod __parse__Top { { // ("," ParameterDef)+ = ("," ParameterDef)+, ",", ParameterDef => ActionFn(1185); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant93(__symbols); + let __sym2 = __pop_Variant92(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant28(__symbols); let __start = __sym0.0; @@ -25146,7 +25135,7 @@ mod __parse__Top { { // ("." Identifier) = ".", Identifier => ActionFn(319); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -25163,7 +25152,7 @@ mod __parse__Top { { // ("." Identifier)+ = ".", Identifier => ActionFn(1342); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -25180,7 +25169,7 @@ mod __parse__Top { { // ("." Identifier)+ = ("." Identifier)+, ".", Identifier => ActionFn(1343); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant18(__symbols); let __start = __sym0.0; @@ -25503,7 +25492,7 @@ mod __parse__Top { { // ("as" Identifier) = "as", Identifier => ActionFn(369); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -25520,7 +25509,7 @@ mod __parse__Top { { // ("as" Identifier)? = "as", Identifier => ActionFn(903); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -25551,7 +25540,7 @@ mod __parse__Top { { // ("else" ":" Suite) = "else", ":", Suite => ActionFn(293); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant76(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -25569,7 +25558,7 @@ mod __parse__Top { { // ("else" ":" Suite)? = "else", ":", Suite => ActionFn(1362); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant76(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -25601,7 +25590,7 @@ mod __parse__Top { { // ("finally" ":" Suite) = "finally", ":", Suite => ActionFn(286); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant76(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -25619,7 +25608,7 @@ mod __parse__Top { { // ("finally" ":" Suite)? = "finally", ":", Suite => ActionFn(1375); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant76(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -26133,7 +26122,7 @@ mod __parse__Top { { // (@L "elif" NamedExpressionTest ":" Suite) = "elif", NamedExpressionTest, ":", Suite => ActionFn(908); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -26181,7 +26170,7 @@ mod __parse__Top { { // (@L "elif" NamedExpressionTest ":" Suite)+ = "elif", NamedExpressionTest, ":", Suite => ActionFn(1454); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -26200,7 +26189,7 @@ mod __parse__Top { { // (@L "elif" NamedExpressionTest ":" Suite)+ = (@L "elif" NamedExpressionTest ":" Suite)+, "elif", NamedExpressionTest, ":", Suite => ActionFn(1455); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant76(__symbols); + let __sym4 = __pop_Variant75(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -26268,7 +26257,7 @@ mod __parse__Top { // (CompOp Expression<"all">) = CompOp, Expression<"all"> => ActionFn(513); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant9(__symbols); - let __sym0 = __pop_Variant67(__symbols); + let __sym0 = __pop_Variant66(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action513::<>(__sym0, __sym1); @@ -26285,7 +26274,7 @@ mod __parse__Top { // (CompOp Expression<"all">)+ = CompOp, Expression<"all"> => ActionFn(1462); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant9(__symbols); - let __sym0 = __pop_Variant67(__symbols); + let __sym0 = __pop_Variant66(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1462::<>(__sym0, __sym1); @@ -26302,7 +26291,7 @@ mod __parse__Top { // (CompOp Expression<"all">)+ = (CompOp Expression<"all">)+, CompOp, Expression<"all"> => ActionFn(1463); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant9(__symbols); - let __sym1 = __pop_Variant67(__symbols); + let __sym1 = __pop_Variant66(__symbols); let __sym0 = __pop_Variant53(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -26407,7 +26396,7 @@ mod __parse__Top { { // (Test<"all"> "as" Identifier) = Test<"all">, "as", Identifier => ActionFn(281); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; @@ -26839,7 +26828,7 @@ mod __parse__Top { ) -> (usize, usize) { // Atom<"all"> = Constant => ActionFn(920); - let __sym0 = __pop_Variant68(__symbols); + let __sym0 = __pop_Variant67(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action920::<>(__sym0); @@ -26854,7 +26843,7 @@ mod __parse__Top { ) -> (usize, usize) { // Atom<"all"> = Identifier => ActionFn(921); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action921::<>(__sym0); @@ -26906,7 +26895,7 @@ mod __parse__Top { // Atom<"all"> = "[", TestOrStarNamedExpr, CompFor, "]" => ActionFn(923); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant65(__symbols); + let __sym2 = __pop_Variant64(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -27036,7 +27025,7 @@ mod __parse__Top { // Atom<"all"> = "(", NamedExpressionTest, CompFor, ")" => ActionFn(931); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant65(__symbols); + let __sym2 = __pop_Variant64(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -27055,7 +27044,7 @@ mod __parse__Top { // Atom<"all"> = "{", DictLiteralValues, "}" => ActionFn(1514); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant71(__symbols); + let __sym1 = __pop_Variant70(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -27090,8 +27079,8 @@ mod __parse__Top { // Atom<"all"> = "{", DictEntry, CompFor, "}" => ActionFn(934); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant65(__symbols); - let __sym1 = __pop_Variant70(__symbols); + let __sym2 = __pop_Variant64(__symbols); + let __sym1 = __pop_Variant69(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -27127,7 +27116,7 @@ mod __parse__Top { // Atom<"all"> = "{", NamedExpressionTest, CompFor, "}" => ActionFn(936); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant65(__symbols); + let __sym2 = __pop_Variant64(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -27204,7 +27193,7 @@ mod __parse__Top { ) -> (usize, usize) { // Atom<"no-withitems"> = Constant => ActionFn(942); - let __sym0 = __pop_Variant68(__symbols); + let __sym0 = __pop_Variant67(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action942::<>(__sym0); @@ -27219,7 +27208,7 @@ mod __parse__Top { ) -> (usize, usize) { // Atom<"no-withitems"> = Identifier => ActionFn(943); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action943::<>(__sym0); @@ -27271,7 +27260,7 @@ mod __parse__Top { // Atom<"no-withitems"> = "[", TestOrStarNamedExpr, CompFor, "]" => ActionFn(945); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant65(__symbols); + let __sym2 = __pop_Variant64(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -27325,7 +27314,7 @@ mod __parse__Top { // Atom<"no-withitems"> = "(", NamedExpressionTest, CompFor, ")" => ActionFn(951); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant65(__symbols); + let __sym2 = __pop_Variant64(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -27344,7 +27333,7 @@ mod __parse__Top { // Atom<"no-withitems"> = "{", DictLiteralValues, "}" => ActionFn(1516); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant71(__symbols); + let __sym1 = __pop_Variant70(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -27379,8 +27368,8 @@ mod __parse__Top { // Atom<"no-withitems"> = "{", DictEntry, CompFor, "}" => ActionFn(954); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant65(__symbols); - let __sym1 = __pop_Variant70(__symbols); + let __sym2 = __pop_Variant64(__symbols); + let __sym1 = __pop_Variant69(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -27416,7 +27405,7 @@ mod __parse__Top { // Atom<"no-withitems"> = "{", NamedExpressionTest, CompFor, "}" => ActionFn(956); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant65(__symbols); + let __sym2 = __pop_Variant64(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -27547,7 +27536,7 @@ mod __parse__Top { { // AtomExpr2<"all"> = AtomExpr2<"all">, ".", Identifier => ActionFn(963); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; @@ -27618,7 +27607,7 @@ mod __parse__Top { { // AtomExpr2<"no-withitems"> = AtomExpr2<"all">, ".", Identifier => ActionFn(966); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; @@ -27894,11 +27883,11 @@ mod __parse__Top { ) -> (usize, usize) { // CapturePattern = Identifier => ActionFn(969); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action969::<>(__sym0); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (1, 136) } pub(crate) fn __reduce341< @@ -27910,12 +27899,12 @@ mod __parse__Top { { // ClassDef = "class", Identifier, "(", ArgumentList, ")", ":", Suite => ActionFn(1502); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant60(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym6.2; @@ -27932,12 +27921,12 @@ mod __parse__Top { { // ClassDef = Decorator+, "class", Identifier, "(", ArgumentList, ")", ":", Suite => ActionFn(1503); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant76(__symbols); + let __sym7 = __pop_Variant75(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant60(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant10(__symbols); let __start = __sym0.0; @@ -27955,9 +27944,9 @@ mod __parse__Top { { // ClassDef = "class", Identifier, ":", Suite => ActionFn(1504); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -27974,9 +27963,9 @@ mod __parse__Top { { // ClassDef = Decorator+, "class", Identifier, ":", Suite => ActionFn(1505); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant76(__symbols); + let __sym4 = __pop_Variant75(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant10(__symbols); let __start = __sym0.0; @@ -27996,7 +27985,7 @@ mod __parse__Top { assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant87(__symbols); + let __sym4 = __pop_Variant86(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -28004,7 +27993,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1594::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (7, 138) } pub(crate) fn __reduce346< @@ -28018,7 +28007,7 @@ mod __parse__Top { assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant87(__symbols); + let __sym5 = __pop_Variant86(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant32(__symbols); let __sym2 = __pop_Variant40(__symbols); @@ -28027,7 +28016,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym7.2; let __nt = super::__action1595::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (8, 138) } pub(crate) fn __reduce347< @@ -28042,7 +28031,7 @@ mod __parse__Top { let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant24(__symbols); - let __sym4 = __pop_Variant87(__symbols); + let __sym4 = __pop_Variant86(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -28050,7 +28039,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym7.2; let __nt = super::__action1596::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (8, 138) } pub(crate) fn __reduce348< @@ -28065,7 +28054,7 @@ mod __parse__Top { let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant24(__symbols); - let __sym5 = __pop_Variant87(__symbols); + let __sym5 = __pop_Variant86(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant32(__symbols); let __sym2 = __pop_Variant40(__symbols); @@ -28074,7 +28063,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym8.2; let __nt = super::__action1597::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (9, 138) } pub(crate) fn __reduce349< @@ -28087,7 +28076,7 @@ mod __parse__Top { // ClassPattern = MatchName, "(", Pattern, ",", MatchKeywordEntry, ")" => ActionFn(1598); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant87(__symbols); + let __sym4 = __pop_Variant86(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -28095,7 +28084,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1598::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (6, 138) } pub(crate) fn __reduce350< @@ -28108,7 +28097,7 @@ mod __parse__Top { // ClassPattern = MatchName, "(", Pattern, ("," Pattern)+, ",", MatchKeywordEntry, ")" => ActionFn(1599); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant87(__symbols); + let __sym5 = __pop_Variant86(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant32(__symbols); let __sym2 = __pop_Variant40(__symbols); @@ -28117,7 +28106,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1599::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (7, 138) } pub(crate) fn __reduce351< @@ -28131,7 +28120,7 @@ mod __parse__Top { assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant24(__symbols); - let __sym4 = __pop_Variant87(__symbols); + let __sym4 = __pop_Variant86(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -28139,7 +28128,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1600::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (7, 138) } pub(crate) fn __reduce352< @@ -28153,7 +28142,7 @@ mod __parse__Top { assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant24(__symbols); - let __sym5 = __pop_Variant87(__symbols); + let __sym5 = __pop_Variant86(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant32(__symbols); let __sym2 = __pop_Variant40(__symbols); @@ -28162,7 +28151,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym7.2; let __nt = super::__action1601::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (8, 138) } pub(crate) fn __reduce353< @@ -28182,7 +28171,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1602::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 138) } pub(crate) fn __reduce354< @@ -28203,7 +28192,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1603::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (6, 138) } pub(crate) fn __reduce355< @@ -28222,7 +28211,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1604::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 138) } pub(crate) fn __reduce356< @@ -28242,7 +28231,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1605::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 138) } pub(crate) fn __reduce357< @@ -28256,13 +28245,13 @@ mod __parse__Top { assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1562::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 138) } pub(crate) fn __reduce358< @@ -28277,13 +28266,13 @@ mod __parse__Top { let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant24(__symbols); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1563::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (6, 138) } pub(crate) fn __reduce359< @@ -28296,13 +28285,13 @@ mod __parse__Top { // ClassPattern = MatchName, "(", MatchKeywordEntry, ")" => ActionFn(1564); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1564::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 138) } pub(crate) fn __reduce360< @@ -28316,13 +28305,13 @@ mod __parse__Top { assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant24(__symbols); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1565::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 138) } pub(crate) fn __reduce361< @@ -28340,7 +28329,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action978::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (3, 138) } pub(crate) fn __reduce362< @@ -28354,7 +28343,7 @@ mod __parse__Top { assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant87(__symbols); + let __sym4 = __pop_Variant86(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -28362,7 +28351,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1606::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (7, 138) } pub(crate) fn __reduce363< @@ -28376,7 +28365,7 @@ mod __parse__Top { assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant87(__symbols); + let __sym5 = __pop_Variant86(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant32(__symbols); let __sym2 = __pop_Variant40(__symbols); @@ -28385,7 +28374,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym7.2; let __nt = super::__action1607::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (8, 138) } pub(crate) fn __reduce364< @@ -28400,7 +28389,7 @@ mod __parse__Top { let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant24(__symbols); - let __sym4 = __pop_Variant87(__symbols); + let __sym4 = __pop_Variant86(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -28408,7 +28397,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym7.2; let __nt = super::__action1608::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (8, 138) } pub(crate) fn __reduce365< @@ -28423,7 +28412,7 @@ mod __parse__Top { let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant24(__symbols); - let __sym5 = __pop_Variant87(__symbols); + let __sym5 = __pop_Variant86(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant32(__symbols); let __sym2 = __pop_Variant40(__symbols); @@ -28432,7 +28421,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym8.2; let __nt = super::__action1609::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7, __sym8); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (9, 138) } pub(crate) fn __reduce366< @@ -28445,7 +28434,7 @@ mod __parse__Top { // ClassPattern = MatchNameOrAttr, "(", Pattern, ",", MatchKeywordEntry, ")" => ActionFn(1610); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant87(__symbols); + let __sym4 = __pop_Variant86(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -28453,7 +28442,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1610::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (6, 138) } pub(crate) fn __reduce367< @@ -28466,7 +28455,7 @@ mod __parse__Top { // ClassPattern = MatchNameOrAttr, "(", Pattern, ("," Pattern)+, ",", MatchKeywordEntry, ")" => ActionFn(1611); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant87(__symbols); + let __sym5 = __pop_Variant86(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant32(__symbols); let __sym2 = __pop_Variant40(__symbols); @@ -28475,7 +28464,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1611::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (7, 138) } pub(crate) fn __reduce368< @@ -28489,7 +28478,7 @@ mod __parse__Top { assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant24(__symbols); - let __sym4 = __pop_Variant87(__symbols); + let __sym4 = __pop_Variant86(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -28497,7 +28486,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1612::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (7, 138) } pub(crate) fn __reduce369< @@ -28511,7 +28500,7 @@ mod __parse__Top { assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant24(__symbols); - let __sym5 = __pop_Variant87(__symbols); + let __sym5 = __pop_Variant86(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant32(__symbols); let __sym2 = __pop_Variant40(__symbols); @@ -28520,7 +28509,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym7.2; let __nt = super::__action1613::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (8, 138) } pub(crate) fn __reduce370< @@ -28540,7 +28529,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1614::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 138) } pub(crate) fn __reduce371< @@ -28561,7 +28550,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1615::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (6, 138) } pub(crate) fn __reduce372< @@ -28580,7 +28569,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1616::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 138) } pub(crate) fn __reduce373< @@ -28600,7 +28589,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1617::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 138) } pub(crate) fn __reduce374< @@ -28614,13 +28603,13 @@ mod __parse__Top { assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1570::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 138) } pub(crate) fn __reduce375< @@ -28635,13 +28624,13 @@ mod __parse__Top { let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant24(__symbols); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1571::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (6, 138) } pub(crate) fn __reduce376< @@ -28654,13 +28643,13 @@ mod __parse__Top { // ClassPattern = MatchNameOrAttr, "(", MatchKeywordEntry, ")" => ActionFn(1572); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1572::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 138) } pub(crate) fn __reduce377< @@ -28674,13 +28663,13 @@ mod __parse__Top { assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant24(__symbols); - let __sym2 = __pop_Variant87(__symbols); + let __sym2 = __pop_Variant86(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1573::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 138) } pub(crate) fn __reduce378< @@ -28698,7 +28687,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action985::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (3, 138) } pub(crate) fn __reduce379< @@ -28709,7 +28698,7 @@ mod __parse__Top { ) -> (usize, usize) { // ClosedPattern = LiteralPattern => ActionFn(90); - let __sym0 = __pop_Variant62(__symbols); + let __sym0 = __pop_Variant40(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action90::<>(__sym0); @@ -28724,7 +28713,7 @@ mod __parse__Top { ) -> (usize, usize) { // ClosedPattern = CapturePattern => ActionFn(91); - let __sym0 = __pop_Variant62(__symbols); + let __sym0 = __pop_Variant40(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action91::<>(__sym0); @@ -28739,7 +28728,7 @@ mod __parse__Top { ) -> (usize, usize) { // ClosedPattern = StarPattern => ActionFn(92); - let __sym0 = __pop_Variant62(__symbols); + let __sym0 = __pop_Variant40(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action92::<>(__sym0); @@ -28754,7 +28743,7 @@ mod __parse__Top { ) -> (usize, usize) { // ClosedPattern = ValuePattern => ActionFn(93); - let __sym0 = __pop_Variant62(__symbols); + let __sym0 = __pop_Variant40(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action93::<>(__sym0); @@ -28769,7 +28758,7 @@ mod __parse__Top { ) -> (usize, usize) { // ClosedPattern = SequencePattern => ActionFn(94); - let __sym0 = __pop_Variant62(__symbols); + let __sym0 = __pop_Variant40(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action94::<>(__sym0); @@ -28784,7 +28773,7 @@ mod __parse__Top { ) -> (usize, usize) { // ClosedPattern = MappingPattern => ActionFn(95); - let __sym0 = __pop_Variant62(__symbols); + let __sym0 = __pop_Variant40(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action95::<>(__sym0); @@ -28799,7 +28788,7 @@ mod __parse__Top { ) -> (usize, usize) { // ClosedPattern = ClassPattern => ActionFn(96); - let __sym0 = __pop_Variant62(__symbols); + let __sym0 = __pop_Variant40(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action96::<>(__sym0); @@ -28818,7 +28807,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1476::<>(__sym0); - __symbols.push((__start, __Symbol::Variant63(__nt), __end)); + __symbols.push((__start, __Symbol::Variant62(__nt), __end)); (1, 140) } pub(crate) fn __reduce387< @@ -28832,7 +28821,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action1477::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant63(__nt), __end)); + __symbols.push((__start, __Symbol::Variant62(__nt), __end)); (0, 140) } pub(crate) fn __reduce388< @@ -28849,7 +28838,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1478::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant63(__nt), __end)); + __symbols.push((__start, __Symbol::Variant62(__nt), __end)); (2, 140) } pub(crate) fn __reduce389< @@ -28864,7 +28853,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1479::<>(__sym0); - __symbols.push((__start, __Symbol::Variant63(__nt), __end)); + __symbols.push((__start, __Symbol::Variant62(__nt), __end)); (1, 140) } pub(crate) fn __reduce390< @@ -28879,7 +28868,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1484::<>(__sym0); - __symbols.push((__start, __Symbol::Variant64(__nt), __end)); + __symbols.push((__start, __Symbol::Variant63(__nt), __end)); (1, 141) } pub(crate) fn __reduce391< @@ -28893,7 +28882,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action1485::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant64(__nt), __end)); + __symbols.push((__start, __Symbol::Variant63(__nt), __end)); (0, 141) } pub(crate) fn __reduce392< @@ -28910,7 +28899,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1486::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant64(__nt), __end)); + __symbols.push((__start, __Symbol::Variant63(__nt), __end)); (2, 141) } pub(crate) fn __reduce393< @@ -28925,7 +28914,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1487::<>(__sym0); - __symbols.push((__start, __Symbol::Variant64(__nt), __end)); + __symbols.push((__start, __Symbol::Variant63(__nt), __end)); (1, 141) } pub(crate) fn __reduce394< @@ -28936,11 +28925,11 @@ mod __parse__Top { ) -> (usize, usize) { // CompFor = SingleForComprehension+ => ActionFn(205); - let __sym0 = __pop_Variant98(__symbols); + let __sym0 = __pop_Variant97(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action205::<>(__sym0); - __symbols.push((__start, __Symbol::Variant65(__nt), __end)); + __symbols.push((__start, __Symbol::Variant64(__nt), __end)); (1, 142) } pub(crate) fn __reduce395< @@ -28951,11 +28940,11 @@ mod __parse__Top { ) -> (usize, usize) { // CompFor? = CompFor => ActionFn(218); - let __sym0 = __pop_Variant65(__symbols); + let __sym0 = __pop_Variant64(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action218::<>(__sym0); - __symbols.push((__start, __Symbol::Variant66(__nt), __end)); + __symbols.push((__start, __Symbol::Variant65(__nt), __end)); (1, 143) } pub(crate) fn __reduce396< @@ -28969,7 +28958,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action219::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant66(__nt), __end)); + __symbols.push((__start, __Symbol::Variant65(__nt), __end)); (0, 143) } pub(crate) fn __reduce397< @@ -28984,7 +28973,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action167::<>(__sym0); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (1, 144) } pub(crate) fn __reduce398< @@ -28999,7 +28988,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action168::<>(__sym0); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (1, 144) } pub(crate) fn __reduce399< @@ -29014,7 +29003,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action169::<>(__sym0); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (1, 144) } pub(crate) fn __reduce400< @@ -29029,7 +29018,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action170::<>(__sym0); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (1, 144) } pub(crate) fn __reduce401< @@ -29044,7 +29033,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action171::<>(__sym0); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (1, 144) } pub(crate) fn __reduce402< @@ -29059,7 +29048,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action172::<>(__sym0); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (1, 144) } pub(crate) fn __reduce403< @@ -29074,7 +29063,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action173::<>(__sym0); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (1, 144) } pub(crate) fn __reduce404< @@ -29091,7 +29080,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action174::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (2, 144) } pub(crate) fn __reduce405< @@ -29106,7 +29095,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action175::<>(__sym0); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (1, 144) } pub(crate) fn __reduce406< @@ -29123,7 +29112,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action176::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant67(__nt), __end)); + __symbols.push((__start, __Symbol::Variant66(__nt), __end)); (2, 144) } pub(crate) fn __reduce407< @@ -29400,7 +29389,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action214::<>(__sym0); - __symbols.push((__start, __Symbol::Variant68(__nt), __end)); + __symbols.push((__start, __Symbol::Variant67(__nt), __end)); (1, 151) } pub(crate) fn __reduce425< @@ -29415,7 +29404,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action215::<>(__sym0); - __symbols.push((__start, __Symbol::Variant68(__nt), __end)); + __symbols.push((__start, __Symbol::Variant67(__nt), __end)); (1, 151) } pub(crate) fn __reduce426< @@ -29430,7 +29419,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action216::<>(__sym0); - __symbols.push((__start, __Symbol::Variant68(__nt), __end)); + __symbols.push((__start, __Symbol::Variant67(__nt), __end)); (1, 151) } pub(crate) fn __reduce427< @@ -29441,7 +29430,7 @@ mod __parse__Top { ) -> (usize, usize) { // ConstantAtom = Constant => ActionFn(988); - let __sym0 = __pop_Variant68(__symbols); + let __sym0 = __pop_Variant67(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action988::<>(__sym0); @@ -29584,11 +29573,11 @@ mod __parse__Top { ) -> (usize, usize) { // DictElement = DictEntry => ActionFn(196); - let __sym0 = __pop_Variant70(__symbols); + let __sym0 = __pop_Variant69(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action196::<>(__sym0); - __symbols.push((__start, __Symbol::Variant69(__nt), __end)); + __symbols.push((__start, __Symbol::Variant68(__nt), __end)); (1, 158) } pub(crate) fn __reduce437< @@ -29605,7 +29594,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action197::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant69(__nt), __end)); + __symbols.push((__start, __Symbol::Variant68(__nt), __end)); (2, 158) } pub(crate) fn __reduce438< @@ -29623,7 +29612,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action195::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant70(__nt), __end)); + __symbols.push((__start, __Symbol::Variant69(__nt), __end)); (3, 159) } pub(crate) fn __reduce439< @@ -29636,11 +29625,11 @@ mod __parse__Top { // DictLiteralValues = DictElement, "," => ActionFn(1526); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant69(__symbols); + let __sym0 = __pop_Variant68(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1526::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant71(__nt), __end)); + __symbols.push((__start, __Symbol::Variant70(__nt), __end)); (2, 160) } pub(crate) fn __reduce440< @@ -29654,11 +29643,11 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant14(__symbols); - let __sym0 = __pop_Variant69(__symbols); + let __sym0 = __pop_Variant68(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1527::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant71(__nt), __end)); + __symbols.push((__start, __Symbol::Variant70(__nt), __end)); (3, 160) } pub(crate) fn __reduce441< @@ -29669,11 +29658,11 @@ mod __parse__Top { ) -> (usize, usize) { // DictLiteralValues = DictElement => ActionFn(1528); - let __sym0 = __pop_Variant69(__symbols); + let __sym0 = __pop_Variant68(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1528::<>(__sym0); - __symbols.push((__start, __Symbol::Variant71(__nt), __end)); + __symbols.push((__start, __Symbol::Variant70(__nt), __end)); (1, 160) } pub(crate) fn __reduce442< @@ -29686,11 +29675,11 @@ mod __parse__Top { // DictLiteralValues = DictElement, ("," DictElement)+ => ActionFn(1529); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant14(__symbols); - let __sym0 = __pop_Variant69(__symbols); + let __sym0 = __pop_Variant68(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1529::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant71(__nt), __end)); + __symbols.push((__start, __Symbol::Variant70(__nt), __end)); (2, 160) } pub(crate) fn __reduce443< @@ -29701,11 +29690,11 @@ mod __parse__Top { ) -> (usize, usize) { // DictLiteralValues? = DictLiteralValues => ActionFn(563); - let __sym0 = __pop_Variant71(__symbols); + let __sym0 = __pop_Variant70(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action563::<>(__sym0); - __symbols.push((__start, __Symbol::Variant72(__nt), __end)); + __symbols.push((__start, __Symbol::Variant71(__nt), __end)); (1, 161) } pub(crate) fn __reduce444< @@ -29719,7 +29708,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action564::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant72(__nt), __end)); + __symbols.push((__start, __Symbol::Variant71(__nt), __end)); (0, 161) } pub(crate) fn __reduce445< @@ -29734,7 +29723,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action64::<>(__sym0); - __symbols.push((__start, __Symbol::Variant73(__nt), __end)); + __symbols.push((__start, __Symbol::Variant72(__nt), __end)); (1, 162) } pub(crate) fn __reduce446< @@ -29751,7 +29740,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action65::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant73(__nt), __end)); + __symbols.push((__start, __Symbol::Variant72(__nt), __end)); (2, 162) } pub(crate) fn __reduce447< @@ -29763,14 +29752,14 @@ mod __parse__Top { { // ExceptClause = "except", Test<"all">, ":", Suite => ActionFn(1882); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1882::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant74(__nt), __end)); + __symbols.push((__start, __Symbol::Variant73(__nt), __end)); (4, 163) } pub(crate) fn __reduce448< @@ -29782,13 +29771,13 @@ mod __parse__Top { { // ExceptClause = "except", ":", Suite => ActionFn(1883); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant76(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1883::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant74(__nt), __end)); + __symbols.push((__start, __Symbol::Variant73(__nt), __end)); (3, 163) } pub(crate) fn __reduce449< @@ -29800,16 +29789,16 @@ mod __parse__Top { { // ExceptClause = "except", Test<"all">, "as", Identifier, ":", Suite => ActionFn(1470); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant76(__symbols); + let __sym5 = __pop_Variant75(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1470::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant74(__nt), __end)); + __symbols.push((__start, __Symbol::Variant73(__nt), __end)); (6, 163) } pub(crate) fn __reduce450< @@ -29820,11 +29809,11 @@ mod __parse__Top { ) -> (usize, usize) { // ExceptClause+ = ExceptClause => ActionFn(287); - let __sym0 = __pop_Variant74(__symbols); + let __sym0 = __pop_Variant73(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action287::<>(__sym0); - __symbols.push((__start, __Symbol::Variant75(__nt), __end)); + __symbols.push((__start, __Symbol::Variant74(__nt), __end)); (1, 164) } pub(crate) fn __reduce451< @@ -29836,12 +29825,12 @@ mod __parse__Top { { // ExceptClause+ = ExceptClause+, ExceptClause => ActionFn(288); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant74(__symbols); - let __sym0 = __pop_Variant75(__symbols); + let __sym1 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant74(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action288::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant75(__nt), __end)); + __symbols.push((__start, __Symbol::Variant74(__nt), __end)); (2, 164) } pub(crate) fn __reduce452< @@ -29853,7 +29842,7 @@ mod __parse__Top { { // ExceptStarClause = "except", "*", Test<"all">, ":", Suite => ActionFn(994); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant76(__symbols); + let __sym4 = __pop_Variant75(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -29861,7 +29850,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action994::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant74(__nt), __end)); + __symbols.push((__start, __Symbol::Variant73(__nt), __end)); (5, 165) } pub(crate) fn __reduce453< @@ -29873,9 +29862,9 @@ mod __parse__Top { { // ExceptStarClause = "except", "*", Test<"all">, "as", Identifier, ":", Suite => ActionFn(1471); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant73(__symbols); + let __sym4 = __pop_Variant72(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -29883,7 +29872,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1471::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant74(__nt), __end)); + __symbols.push((__start, __Symbol::Variant73(__nt), __end)); (7, 165) } pub(crate) fn __reduce454< @@ -29894,11 +29883,11 @@ mod __parse__Top { ) -> (usize, usize) { // ExceptStarClause+ = ExceptStarClause => ActionFn(282); - let __sym0 = __pop_Variant74(__symbols); + let __sym0 = __pop_Variant73(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action282::<>(__sym0); - __symbols.push((__start, __Symbol::Variant75(__nt), __end)); + __symbols.push((__start, __Symbol::Variant74(__nt), __end)); (1, 166) } pub(crate) fn __reduce455< @@ -29910,12 +29899,12 @@ mod __parse__Top { { // ExceptStarClause+ = ExceptStarClause+, ExceptStarClause => ActionFn(283); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant74(__symbols); - let __sym0 = __pop_Variant75(__symbols); + let __sym1 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant74(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action283::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant75(__nt), __end)); + __symbols.push((__start, __Symbol::Variant74(__nt), __end)); (2, 166) } pub(crate) fn __reduce456< @@ -30208,7 +30197,7 @@ mod __parse__Top { // Factor<"all"> = UnaryOp, Factor<"all"> => ActionFn(1001); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant9(__symbols); - let __sym0 = __pop_Variant104(__symbols); + let __sym0 = __pop_Variant103(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1001::<>(__sym0, __sym1); @@ -30240,7 +30229,7 @@ mod __parse__Top { // Factor<"no-withitems"> = UnaryOp, Factor<"all"> => ActionFn(1002); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant9(__symbols); - let __sym0 = __pop_Variant104(__symbols); + let __sym0 = __pop_Variant103(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1002::<>(__sym0, __sym1); @@ -30270,11 +30259,11 @@ mod __parse__Top { ) -> (usize, usize) { // FileLine = Statement => ActionFn(5); - let __sym0 = __pop_Variant76(__symbols); + let __sym0 = __pop_Variant75(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action5::<>(__sym0); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (1, 176) } pub(crate) fn __reduce478< @@ -30289,7 +30278,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action6::<>(__sym0); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (1, 176) } pub(crate) fn __reduce479< @@ -30303,7 +30292,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action349::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant77(__nt), __end)); + __symbols.push((__start, __Symbol::Variant76(__nt), __end)); (0, 177) } pub(crate) fn __reduce480< @@ -30314,11 +30303,11 @@ mod __parse__Top { ) -> (usize, usize) { // FileLine* = FileLine+ => ActionFn(350); - let __sym0 = __pop_Variant77(__symbols); + let __sym0 = __pop_Variant76(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action350::<>(__sym0); - __symbols.push((__start, __Symbol::Variant77(__nt), __end)); + __symbols.push((__start, __Symbol::Variant76(__nt), __end)); (1, 177) } pub(crate) fn __reduce481< @@ -30329,11 +30318,11 @@ mod __parse__Top { ) -> (usize, usize) { // FileLine+ = FileLine => ActionFn(358); - let __sym0 = __pop_Variant76(__symbols); + let __sym0 = __pop_Variant75(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action358::<>(__sym0); - __symbols.push((__start, __Symbol::Variant77(__nt), __end)); + __symbols.push((__start, __Symbol::Variant76(__nt), __end)); (1, 178) } pub(crate) fn __reduce482< @@ -30345,12 +30334,12 @@ mod __parse__Top { { // FileLine+ = FileLine+, FileLine => ActionFn(359); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant76(__symbols); - let __sym0 = __pop_Variant77(__symbols); + let __sym1 = __pop_Variant75(__symbols); + let __sym0 = __pop_Variant76(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action359::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant77(__nt), __end)); + __symbols.push((__start, __Symbol::Variant76(__nt), __end)); (2, 178) } pub(crate) fn __reduce483< @@ -30454,10 +30443,10 @@ mod __parse__Top { { // ForStatement = "async", "for", ExpressionList, "in", GenericList, ":", Suite, "else", ":", Suite => ActionFn(1894); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant76(__symbols); + let __sym9 = __pop_Variant75(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant9(__symbols); let __sym3 = __pop_Variant0(__symbols); @@ -30479,7 +30468,7 @@ mod __parse__Top { { // ForStatement = "async", "for", ExpressionList, "in", GenericList, ":", Suite => ActionFn(1895); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant9(__symbols); let __sym3 = __pop_Variant0(__symbols); @@ -30501,10 +30490,10 @@ mod __parse__Top { { // ForStatement = "for", ExpressionList, "in", GenericList, ":", Suite, "else", ":", Suite => ActionFn(1896); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant76(__symbols); + let __sym8 = __pop_Variant75(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant76(__symbols); + let __sym5 = __pop_Variant75(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant9(__symbols); let __sym2 = __pop_Variant0(__symbols); @@ -30525,7 +30514,7 @@ mod __parse__Top { { // ForStatement = "for", ExpressionList, "in", GenericList, ":", Suite => ActionFn(1897); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant76(__symbols); + let __sym5 = __pop_Variant75(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant9(__symbols); let __sym2 = __pop_Variant0(__symbols); @@ -30546,12 +30535,12 @@ mod __parse__Top { { // FuncDef = "async", "def", Identifier, Parameters, "->", Test<"all">, ":", Suite => ActionFn(1506); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant76(__symbols); + let __sym7 = __pop_Variant75(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant9(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant55(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -30569,12 +30558,12 @@ mod __parse__Top { { // FuncDef = Decorator+, "async", "def", Identifier, Parameters, "->", Test<"all">, ":", Suite => ActionFn(1507); assert!(__symbols.len() >= 9); - let __sym8 = __pop_Variant76(__symbols); + let __sym8 = __pop_Variant75(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant9(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant55(__symbols); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant10(__symbols); @@ -30593,10 +30582,10 @@ mod __parse__Top { { // FuncDef = "async", "def", Identifier, Parameters, ":", Suite => ActionFn(1508); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant76(__symbols); + let __sym5 = __pop_Variant75(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant55(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -30614,10 +30603,10 @@ mod __parse__Top { { // FuncDef = Decorator+, "async", "def", Identifier, Parameters, ":", Suite => ActionFn(1509); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant55(__symbols); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant10(__symbols); @@ -30636,12 +30625,12 @@ mod __parse__Top { { // FuncDef = "def", Identifier, Parameters, "->", Test<"all">, ":", Suite => ActionFn(1510); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant9(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant55(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym6.2; @@ -30658,12 +30647,12 @@ mod __parse__Top { { // FuncDef = Decorator+, "def", Identifier, Parameters, "->", Test<"all">, ":", Suite => ActionFn(1511); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant76(__symbols); + let __sym7 = __pop_Variant75(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant9(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant55(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant10(__symbols); let __start = __sym0.0; @@ -30681,10 +30670,10 @@ mod __parse__Top { { // FuncDef = "def", Identifier, Parameters, ":", Suite => ActionFn(1512); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant76(__symbols); + let __sym4 = __pop_Variant75(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant55(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; @@ -30701,10 +30690,10 @@ mod __parse__Top { { // FuncDef = Decorator+, "def", Identifier, Parameters, ":", Suite => ActionFn(1513); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant76(__symbols); + let __sym5 = __pop_Variant75(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant55(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant10(__symbols); let __start = __sym0.0; @@ -30722,7 +30711,7 @@ mod __parse__Top { { // FunctionArgument = NamedExpressionTest, CompFor => ActionFn(1496); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant65(__symbols); + let __sym1 = __pop_Variant64(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -30756,7 +30745,7 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1012::<>(__sym0, __sym1, __sym2); @@ -30809,7 +30798,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action436::<>(__sym0); - __symbols.push((__start, __Symbol::Variant78(__nt), __end)); + __symbols.push((__start, __Symbol::Variant77(__nt), __end)); (1, 183) } pub(crate) fn __reduce507< @@ -30823,7 +30812,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action437::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant78(__nt), __end)); + __symbols.push((__start, __Symbol::Variant77(__nt), __end)); (0, 183) } pub(crate) fn __reduce508< @@ -30969,7 +30958,7 @@ mod __parse__Top { { // GlobalStatement = "global", Identifier => ActionFn(1538); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -30987,7 +30976,7 @@ mod __parse__Top { // GlobalStatement = "global", Identifier, ("," Identifier)+ => ActionFn(1539); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant18(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -31024,7 +31013,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action217::<>(__sym0); - __symbols.push((__start, __Symbol::Variant73(__nt), __end)); + __symbols.push((__start, __Symbol::Variant72(__nt), __end)); (1, 188) } pub(crate) fn __reduce520< @@ -31036,10 +31025,10 @@ mod __parse__Top { { // IfStatement = "if", NamedExpressionTest, ":", Suite, "else", ":", Suite => ActionFn(1456); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -31058,11 +31047,11 @@ mod __parse__Top { { // IfStatement = "if", NamedExpressionTest, ":", Suite, (@L "elif" NamedExpressionTest ":" Suite)+, "else", ":", Suite => ActionFn(1457); assert!(__symbols.len() >= 8); - let __sym7 = __pop_Variant76(__symbols); + let __sym7 = __pop_Variant75(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant49(__symbols); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -31081,7 +31070,7 @@ mod __parse__Top { { // IfStatement = "if", NamedExpressionTest, ":", Suite => ActionFn(1458); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -31101,7 +31090,7 @@ mod __parse__Top { // IfStatement = "if", NamedExpressionTest, ":", Suite, (@L "elif" NamedExpressionTest ":" Suite)+ => ActionFn(1459); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant49(__symbols); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -31120,13 +31109,13 @@ mod __parse__Top { { // ImportAsAlias = DottedName, "as", Identifier => ActionFn(1021); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1021::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant79(__nt), __end)); + __symbols.push((__start, __Symbol::Variant78(__nt), __end)); (3, 190) } pub(crate) fn __reduce525< @@ -31137,11 +31126,11 @@ mod __parse__Top { ) -> (usize, usize) { // ImportAsAlias = DottedName => ActionFn(1022); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1022::<>(__sym0); - __symbols.push((__start, __Symbol::Variant79(__nt), __end)); + __symbols.push((__start, __Symbol::Variant78(__nt), __end)); (1, 190) } pub(crate) fn __reduce526< @@ -31153,13 +31142,13 @@ mod __parse__Top { { // ImportAsAlias = Identifier, "as", Identifier => ActionFn(1023); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1023::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant79(__nt), __end)); + __symbols.push((__start, __Symbol::Variant78(__nt), __end)); (3, 191) } pub(crate) fn __reduce527< @@ -31170,11 +31159,11 @@ mod __parse__Top { ) -> (usize, usize) { // ImportAsAlias = Identifier => ActionFn(1024); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1024::<>(__sym0); - __symbols.push((__start, __Symbol::Variant79(__nt), __end)); + __symbols.push((__start, __Symbol::Variant78(__nt), __end)); (1, 191) } pub(crate) fn __reduce528< @@ -31186,13 +31175,13 @@ mod __parse__Top { { // ImportAsNames = Identifier, "as", Identifier => ActionFn(1546); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1546::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (3, 192) } pub(crate) fn __reduce529< @@ -31205,13 +31194,13 @@ mod __parse__Top { // ImportAsNames = Identifier, "as", Identifier, ("," ImportAsAlias)+ => ActionFn(1547); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant20(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1547::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (4, 192) } pub(crate) fn __reduce530< @@ -31222,11 +31211,11 @@ mod __parse__Top { ) -> (usize, usize) { // ImportAsNames = Identifier => ActionFn(1548); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1548::<>(__sym0); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (1, 192) } pub(crate) fn __reduce531< @@ -31239,11 +31228,11 @@ mod __parse__Top { // ImportAsNames = Identifier, ("," ImportAsAlias)+ => ActionFn(1549); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant20(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1549::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (2, 192) } pub(crate) fn __reduce532< @@ -31257,14 +31246,14 @@ mod __parse__Top { assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1550::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (6, 192) } pub(crate) fn __reduce533< @@ -31279,14 +31268,14 @@ mod __parse__Top { let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant20(__symbols); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1551::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (7, 192) } pub(crate) fn __reduce534< @@ -31300,12 +31289,12 @@ mod __parse__Top { assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1552::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (4, 192) } pub(crate) fn __reduce535< @@ -31320,12 +31309,12 @@ mod __parse__Top { let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant20(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1553::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (5, 192) } pub(crate) fn __reduce536< @@ -31338,14 +31327,14 @@ mod __parse__Top { // ImportAsNames = "(", Identifier, "as", Identifier, ")" => ActionFn(1554); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1554::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (5, 192) } pub(crate) fn __reduce537< @@ -31359,14 +31348,14 @@ mod __parse__Top { assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant20(__symbols); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1555::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (6, 192) } pub(crate) fn __reduce538< @@ -31379,12 +31368,12 @@ mod __parse__Top { // ImportAsNames = "(", Identifier, ")" => ActionFn(1556); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1556::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (3, 192) } pub(crate) fn __reduce539< @@ -31398,12 +31387,12 @@ mod __parse__Top { assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant20(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1557::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (4, 192) } pub(crate) fn __reduce540< @@ -31418,7 +31407,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1028::<>(__sym0); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (1, 192) } pub(crate) fn __reduce541< @@ -31433,7 +31422,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action59::<>(__sym0); - __symbols.push((__start, __Symbol::Variant81(__nt), __end)); + __symbols.push((__start, __Symbol::Variant80(__nt), __end)); (1, 193) } pub(crate) fn __reduce542< @@ -31448,7 +31437,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action60::<>(__sym0); - __symbols.push((__start, __Symbol::Variant81(__nt), __end)); + __symbols.push((__start, __Symbol::Variant80(__nt), __end)); (1, 193) } pub(crate) fn __reduce543< @@ -31462,7 +31451,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action326::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant82(__nt), __end)); + __symbols.push((__start, __Symbol::Variant81(__nt), __end)); (0, 194) } pub(crate) fn __reduce544< @@ -31473,11 +31462,11 @@ mod __parse__Top { ) -> (usize, usize) { // ImportDots* = ImportDots+ => ActionFn(327); - let __sym0 = __pop_Variant82(__symbols); + let __sym0 = __pop_Variant81(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action327::<>(__sym0); - __symbols.push((__start, __Symbol::Variant82(__nt), __end)); + __symbols.push((__start, __Symbol::Variant81(__nt), __end)); (1, 194) } pub(crate) fn __reduce545< @@ -31488,11 +31477,11 @@ mod __parse__Top { ) -> (usize, usize) { // ImportDots+ = ImportDots => ActionFn(324); - let __sym0 = __pop_Variant81(__symbols); + let __sym0 = __pop_Variant80(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action324::<>(__sym0); - __symbols.push((__start, __Symbol::Variant82(__nt), __end)); + __symbols.push((__start, __Symbol::Variant81(__nt), __end)); (1, 195) } pub(crate) fn __reduce546< @@ -31504,12 +31493,12 @@ mod __parse__Top { { // ImportDots+ = ImportDots+, ImportDots => ActionFn(325); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant81(__symbols); - let __sym0 = __pop_Variant82(__symbols); + let __sym1 = __pop_Variant80(__symbols); + let __sym0 = __pop_Variant81(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action325::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant82(__nt), __end)); + __symbols.push((__start, __Symbol::Variant81(__nt), __end)); (2, 195) } pub(crate) fn __reduce547< @@ -31520,11 +31509,11 @@ mod __parse__Top { ) -> (usize, usize) { // ImportFromLocation = DottedName => ActionFn(1520); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1520::<>(__sym0); - __symbols.push((__start, __Symbol::Variant83(__nt), __end)); + __symbols.push((__start, __Symbol::Variant82(__nt), __end)); (1, 196) } pub(crate) fn __reduce548< @@ -31536,12 +31525,12 @@ mod __parse__Top { { // ImportFromLocation = ImportDots+, DottedName => ActionFn(1521); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); - let __sym0 = __pop_Variant82(__symbols); + let __sym1 = __pop_Variant72(__symbols); + let __sym0 = __pop_Variant81(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1521::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant83(__nt), __end)); + __symbols.push((__start, __Symbol::Variant82(__nt), __end)); (2, 196) } pub(crate) fn __reduce549< @@ -31552,11 +31541,11 @@ mod __parse__Top { ) -> (usize, usize) { // ImportFromLocation = ImportDots+ => ActionFn(58); - let __sym0 = __pop_Variant82(__symbols); + let __sym0 = __pop_Variant81(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action58::<>(__sym0); - __symbols.push((__start, __Symbol::Variant83(__nt), __end)); + __symbols.push((__start, __Symbol::Variant82(__nt), __end)); (1, 196) } pub(crate) fn __reduce550< @@ -31568,9 +31557,9 @@ mod __parse__Top { { // ImportStatement = "import", DottedName, "as", Identifier => ActionFn(1542); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -31588,9 +31577,9 @@ mod __parse__Top { // ImportStatement = "import", DottedName, "as", Identifier, ("," ImportAsAlias)+ => ActionFn(1543); assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant20(__symbols); - let __sym3 = __pop_Variant73(__symbols); + let __sym3 = __pop_Variant72(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; @@ -31607,7 +31596,7 @@ mod __parse__Top { { // ImportStatement = "import", DottedName => ActionFn(1544); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -31625,7 +31614,7 @@ mod __parse__Top { // ImportStatement = "import", DottedName, ("," ImportAsAlias)+ => ActionFn(1545); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant20(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -31642,9 +31631,9 @@ mod __parse__Top { { // ImportStatement = "from", ImportFromLocation, "import", ImportAsNames => ActionFn(1030); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant80(__symbols); + let __sym3 = __pop_Variant79(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant83(__symbols); + let __sym1 = __pop_Variant82(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; @@ -31661,12 +31650,12 @@ mod __parse__Top { { // KwargParameter = "**", TypedParameter => ActionFn(1910); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1910::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant84(__nt), __end)); + __symbols.push((__start, __Symbol::Variant83(__nt), __end)); (2, 198) } pub(crate) fn __reduce556< @@ -31681,7 +31670,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1911::<>(__sym0); - __symbols.push((__start, __Symbol::Variant84(__nt), __end)); + __symbols.push((__start, __Symbol::Variant83(__nt), __end)); (1, 198) } pub(crate) fn __reduce557< @@ -31693,12 +31682,12 @@ mod __parse__Top { { // KwargParameter = "**", UntypedParameter => ActionFn(1252); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant101(__symbols); + let __sym1 = __pop_Variant100(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1252::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant84(__nt), __end)); + __symbols.push((__start, __Symbol::Variant83(__nt), __end)); (2, 199) } pub(crate) fn __reduce558< @@ -31713,7 +31702,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1253::<>(__sym0); - __symbols.push((__start, __Symbol::Variant84(__nt), __end)); + __symbols.push((__start, __Symbol::Variant83(__nt), __end)); (1, 199) } pub(crate) fn __reduce561< @@ -31824,7 +31813,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1032::<>(__sym0); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (1, 203) } pub(crate) fn __reduce568< @@ -31839,7 +31828,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1033::<>(__sym0); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (1, 203) } pub(crate) fn __reduce569< @@ -31854,7 +31843,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1034::<>(__sym0); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (1, 203) } pub(crate) fn __reduce570< @@ -31869,7 +31858,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1035::<>(__sym0); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (1, 203) } pub(crate) fn __reduce571< @@ -31884,7 +31873,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1036::<>(__sym0); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (1, 203) } pub(crate) fn __reduce573< @@ -31991,7 +31980,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1042::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (2, 205) } pub(crate) fn __reduce581< @@ -32005,12 +31994,12 @@ mod __parse__Top { assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1574::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 205) } pub(crate) fn __reduce582< @@ -32025,12 +32014,12 @@ mod __parse__Top { let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant26(__symbols); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1575::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 205) } pub(crate) fn __reduce583< @@ -32043,12 +32032,12 @@ mod __parse__Top { // MappingPattern = "{", MatchMappingEntry, "}" => ActionFn(1576); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1576::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (3, 205) } pub(crate) fn __reduce584< @@ -32062,12 +32051,12 @@ mod __parse__Top { assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant26(__symbols); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1577::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 205) } pub(crate) fn __reduce585< @@ -32081,13 +32070,13 @@ mod __parse__Top { assert!(__symbols.len() >= 5); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1045::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 205) } pub(crate) fn __reduce586< @@ -32100,13 +32089,13 @@ mod __parse__Top { // MappingPattern = "{", "**", Identifier, "}" => ActionFn(1046); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1046::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 205) } pub(crate) fn __reduce587< @@ -32120,15 +32109,15 @@ mod __parse__Top { assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant73(__symbols); + let __sym4 = __pop_Variant72(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1578::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (7, 205) } pub(crate) fn __reduce588< @@ -32142,16 +32131,16 @@ mod __parse__Top { assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant73(__symbols); + let __sym5 = __pop_Variant72(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant26(__symbols); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym7.2; let __nt = super::__action1579::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6, __sym7); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (8, 205) } pub(crate) fn __reduce589< @@ -32164,15 +32153,15 @@ mod __parse__Top { // MappingPattern = "{", MatchMappingEntry, ",", "**", Identifier, "}" => ActionFn(1580); assert!(__symbols.len() >= 6); let __sym5 = __pop_Variant0(__symbols); - let __sym4 = __pop_Variant73(__symbols); + let __sym4 = __pop_Variant72(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1580::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (6, 205) } pub(crate) fn __reduce590< @@ -32185,16 +32174,16 @@ mod __parse__Top { // MappingPattern = "{", MatchMappingEntry, ("," MatchMappingEntry)+, ",", "**", Identifier, "}" => ActionFn(1581); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant73(__symbols); + let __sym5 = __pop_Variant72(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant26(__symbols); - let __sym1 = __pop_Variant88(__symbols); + let __sym1 = __pop_Variant87(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym6.2; let __nt = super::__action1581::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5, __sym6); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (7, 205) } pub(crate) fn __reduce591< @@ -32206,7 +32195,7 @@ mod __parse__Top { { // MatchCase = "case", Patterns, Guard, ":", Suite => ActionFn(1465); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant76(__symbols); + let __sym4 = __pop_Variant75(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant40(__symbols); @@ -32214,7 +32203,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1465::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant85(__nt), __end)); + __symbols.push((__start, __Symbol::Variant84(__nt), __end)); (5, 206) } pub(crate) fn __reduce592< @@ -32226,14 +32215,14 @@ mod __parse__Top { { // MatchCase = "case", Patterns, ":", Suite => ActionFn(1466); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant40(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1466::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant85(__nt), __end)); + __symbols.push((__start, __Symbol::Variant84(__nt), __end)); (4, 206) } pub(crate) fn __reduce593< @@ -32244,11 +32233,11 @@ mod __parse__Top { ) -> (usize, usize) { // MatchCase+ = MatchCase => ActionFn(311); - let __sym0 = __pop_Variant85(__symbols); + let __sym0 = __pop_Variant84(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action311::<>(__sym0); - __symbols.push((__start, __Symbol::Variant86(__nt), __end)); + __symbols.push((__start, __Symbol::Variant85(__nt), __end)); (1, 207) } pub(crate) fn __reduce594< @@ -32260,12 +32249,12 @@ mod __parse__Top { { // MatchCase+ = MatchCase+, MatchCase => ActionFn(312); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant85(__symbols); - let __sym0 = __pop_Variant86(__symbols); + let __sym1 = __pop_Variant84(__symbols); + let __sym0 = __pop_Variant85(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action312::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant86(__nt), __end)); + __symbols.push((__start, __Symbol::Variant85(__nt), __end)); (2, 207) } pub(crate) fn __reduce595< @@ -32279,11 +32268,11 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant40(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action129::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant87(__nt), __end)); + __symbols.push((__start, __Symbol::Variant86(__nt), __end)); (3, 208) } pub(crate) fn __reduce596< @@ -32301,7 +32290,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action124::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant88(__nt), __end)); + __symbols.push((__start, __Symbol::Variant87(__nt), __end)); (3, 209) } pub(crate) fn __reduce597< @@ -32312,7 +32301,7 @@ mod __parse__Top { ) -> (usize, usize) { // MatchName = Identifier => ActionFn(1050); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1050::<>(__sym0); @@ -32328,7 +32317,7 @@ mod __parse__Top { { // MatchNameOrAttr = MatchName, ".", Identifier => ActionFn(1051); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; @@ -32346,7 +32335,7 @@ mod __parse__Top { { // MatchNameOrAttr = MatchNameOrAttr, ".", Identifier => ActionFn(1052); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; @@ -32365,7 +32354,7 @@ mod __parse__Top { // MatchStatement = "match", TestOrStarNamedExpr, ":", "\n", Indent, MatchCase+, Dedent => ActionFn(1053); assert!(__symbols.len() >= 7); let __sym6 = __pop_Variant0(__symbols); - let __sym5 = __pop_Variant86(__symbols); + let __sym5 = __pop_Variant85(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); @@ -32387,7 +32376,7 @@ mod __parse__Top { // MatchStatement = "match", TestOrStarNamedExpr, ",", ":", "\n", Indent, MatchCase+, Dedent => ActionFn(1054); assert!(__symbols.len() >= 8); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant86(__symbols); + let __sym6 = __pop_Variant85(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); @@ -32410,7 +32399,7 @@ mod __parse__Top { // MatchStatement = "match", TestOrStarNamedExpr, ",", TestOrStarNamedExpr, ",", ":", "\n", Indent, MatchCase+, Dedent => ActionFn(1630); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant86(__symbols); + let __sym8 = __pop_Variant85(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -32435,7 +32424,7 @@ mod __parse__Top { // MatchStatement = "match", TestOrStarNamedExpr, ",", TestOrStarNamedExpr, ("," TestOrStarNamedExpr)+, ",", ":", "\n", Indent, MatchCase+, Dedent => ActionFn(1631); assert!(__symbols.len() >= 11); let __sym10 = __pop_Variant0(__symbols); - let __sym9 = __pop_Variant86(__symbols); + let __sym9 = __pop_Variant85(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); @@ -32461,7 +32450,7 @@ mod __parse__Top { // MatchStatement = "match", TestOrStarNamedExpr, ",", TestOrStarNamedExpr, ":", "\n", Indent, MatchCase+, Dedent => ActionFn(1632); assert!(__symbols.len() >= 9); let __sym8 = __pop_Variant0(__symbols); - let __sym7 = __pop_Variant86(__symbols); + let __sym7 = __pop_Variant85(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); @@ -32485,7 +32474,7 @@ mod __parse__Top { // MatchStatement = "match", TestOrStarNamedExpr, ",", TestOrStarNamedExpr, ("," TestOrStarNamedExpr)+, ":", "\n", Indent, MatchCase+, Dedent => ActionFn(1633); assert!(__symbols.len() >= 10); let __sym9 = __pop_Variant0(__symbols); - let __sym8 = __pop_Variant86(__symbols); + let __sym8 = __pop_Variant85(__symbols); let __sym7 = __pop_Variant0(__symbols); let __sym6 = __pop_Variant0(__symbols); let __sym5 = __pop_Variant0(__symbols); @@ -32586,7 +32575,7 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1057::<>(__sym0, __sym1, __sym2); @@ -32662,7 +32651,7 @@ mod __parse__Top { { // NonlocalStatement = "nonlocal", Identifier => ActionFn(1540); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -32680,7 +32669,7 @@ mod __parse__Top { // NonlocalStatement = "nonlocal", Identifier, ("," Identifier)+ => ActionFn(1541); assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant18(__symbols); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym2.2; @@ -32760,11 +32749,11 @@ mod __parse__Top { ) -> (usize, usize) { // OneOrMore = DictElement => ActionFn(698); - let __sym0 = __pop_Variant69(__symbols); + let __sym0 = __pop_Variant68(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action698::<>(__sym0); - __symbols.push((__start, __Symbol::Variant71(__nt), __end)); + __symbols.push((__start, __Symbol::Variant70(__nt), __end)); (1, 220) } pub(crate) fn __reduce623< @@ -32777,11 +32766,11 @@ mod __parse__Top { // OneOrMore = DictElement, ("," DictElement)+ => ActionFn(699); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant14(__symbols); - let __sym0 = __pop_Variant69(__symbols); + let __sym0 = __pop_Variant68(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action699::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant71(__nt), __end)); + __symbols.push((__start, __Symbol::Variant70(__nt), __end)); (2, 220) } pub(crate) fn __reduce624< @@ -32824,11 +32813,11 @@ mod __parse__Top { ) -> (usize, usize) { // OneOrMore = Identifier => ActionFn(706); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action706::<>(__sym0); - __symbols.push((__start, __Symbol::Variant89(__nt), __end)); + __symbols.push((__start, __Symbol::Variant88(__nt), __end)); (1, 222) } pub(crate) fn __reduce627< @@ -32841,11 +32830,11 @@ mod __parse__Top { // OneOrMore = Identifier, ("," Identifier)+ => ActionFn(707); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant18(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action707::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant89(__nt), __end)); + __symbols.push((__start, __Symbol::Variant88(__nt), __end)); (2, 222) } pub(crate) fn __reduce628< @@ -32857,13 +32846,13 @@ mod __parse__Top { { // OneOrMore> = DottedName, "as", Identifier => ActionFn(1140); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1140::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (3, 223) } pub(crate) fn __reduce629< @@ -32876,13 +32865,13 @@ mod __parse__Top { // OneOrMore> = DottedName, "as", Identifier, ("," ImportAsAlias)+ => ActionFn(1141); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant20(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1141::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (4, 223) } pub(crate) fn __reduce630< @@ -32893,11 +32882,11 @@ mod __parse__Top { ) -> (usize, usize) { // OneOrMore> = DottedName => ActionFn(1142); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1142::<>(__sym0); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (1, 223) } pub(crate) fn __reduce631< @@ -32910,11 +32899,11 @@ mod __parse__Top { // OneOrMore> = DottedName, ("," ImportAsAlias)+ => ActionFn(1143); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant20(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1143::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (2, 223) } pub(crate) fn __reduce632< @@ -32926,13 +32915,13 @@ mod __parse__Top { { // OneOrMore> = Identifier, "as", Identifier => ActionFn(1152); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1152::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (3, 224) } pub(crate) fn __reduce633< @@ -32945,13 +32934,13 @@ mod __parse__Top { // OneOrMore> = Identifier, "as", Identifier, ("," ImportAsAlias)+ => ActionFn(1153); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant20(__symbols); - let __sym2 = __pop_Variant73(__symbols); + let __sym2 = __pop_Variant72(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1153::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (4, 224) } pub(crate) fn __reduce634< @@ -32962,11 +32951,11 @@ mod __parse__Top { ) -> (usize, usize) { // OneOrMore> = Identifier => ActionFn(1154); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1154::<>(__sym0); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (1, 224) } pub(crate) fn __reduce635< @@ -32979,11 +32968,11 @@ mod __parse__Top { // OneOrMore> = Identifier, ("," ImportAsAlias)+ => ActionFn(1155); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant20(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1155::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant80(__nt), __end)); + __symbols.push((__start, __Symbol::Variant79(__nt), __end)); (2, 224) } pub(crate) fn __reduce636< @@ -32994,11 +32983,11 @@ mod __parse__Top { ) -> (usize, usize) { // OneOrMore = MatchKeywordEntry => ActionFn(1168); - let __sym0 = __pop_Variant87(__symbols); + let __sym0 = __pop_Variant86(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1168::<>(__sym0); - __symbols.push((__start, __Symbol::Variant90(__nt), __end)); + __symbols.push((__start, __Symbol::Variant89(__nt), __end)); (1, 225) } pub(crate) fn __reduce637< @@ -33011,11 +33000,11 @@ mod __parse__Top { // OneOrMore = MatchKeywordEntry, ("," MatchKeywordEntry)+ => ActionFn(1169); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant24(__symbols); - let __sym0 = __pop_Variant87(__symbols); + let __sym0 = __pop_Variant86(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1169::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant90(__nt), __end)); + __symbols.push((__start, __Symbol::Variant89(__nt), __end)); (2, 225) } pub(crate) fn __reduce638< @@ -33026,11 +33015,11 @@ mod __parse__Top { ) -> (usize, usize) { // OneOrMore = MatchMappingEntry => ActionFn(1172); - let __sym0 = __pop_Variant88(__symbols); + let __sym0 = __pop_Variant87(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1172::<>(__sym0); - __symbols.push((__start, __Symbol::Variant91(__nt), __end)); + __symbols.push((__start, __Symbol::Variant90(__nt), __end)); (1, 226) } pub(crate) fn __reduce639< @@ -33043,11 +33032,11 @@ mod __parse__Top { // OneOrMore = MatchMappingEntry, ("," MatchMappingEntry)+ => ActionFn(1173); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant26(__symbols); - let __sym0 = __pop_Variant88(__symbols); + let __sym0 = __pop_Variant87(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1173::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant91(__nt), __end)); + __symbols.push((__start, __Symbol::Variant90(__nt), __end)); (2, 226) } pub(crate) fn __reduce640< @@ -33058,11 +33047,11 @@ mod __parse__Top { ) -> (usize, usize) { // OneOrMore> = ParameterDef => ActionFn(1176); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1176::<>(__sym0); - __symbols.push((__start, __Symbol::Variant92(__nt), __end)); + __symbols.push((__start, __Symbol::Variant91(__nt), __end)); (1, 227) } pub(crate) fn __reduce641< @@ -33075,11 +33064,11 @@ mod __parse__Top { // OneOrMore> = ParameterDef, ("," ParameterDef)+ => ActionFn(1177); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1177::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant92(__nt), __end)); + __symbols.push((__start, __Symbol::Variant91(__nt), __end)); (2, 227) } pub(crate) fn __reduce642< @@ -33090,11 +33079,11 @@ mod __parse__Top { ) -> (usize, usize) { // OneOrMore> = ParameterDef => ActionFn(1186); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1186::<>(__sym0); - __symbols.push((__start, __Symbol::Variant92(__nt), __end)); + __symbols.push((__start, __Symbol::Variant91(__nt), __end)); (1, 228) } pub(crate) fn __reduce643< @@ -33107,11 +33096,11 @@ mod __parse__Top { // OneOrMore> = ParameterDef, ("," ParameterDef)+ => ActionFn(1187); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1187::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant92(__nt), __end)); + __symbols.push((__start, __Symbol::Variant91(__nt), __end)); (2, 228) } pub(crate) fn __reduce644< @@ -33126,7 +33115,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1314::<>(__sym0); - __symbols.push((__start, __Symbol::Variant64(__nt), __end)); + __symbols.push((__start, __Symbol::Variant63(__nt), __end)); (1, 229) } pub(crate) fn __reduce645< @@ -33143,7 +33132,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1315::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant64(__nt), __end)); + __symbols.push((__start, __Symbol::Variant63(__nt), __end)); (2, 229) } pub(crate) fn __reduce646< @@ -33346,11 +33335,11 @@ mod __parse__Top { ) -> (usize, usize) { // ParameterDef = TypedParameter => ActionFn(473); - let __sym0 = __pop_Variant101(__symbols); + let __sym0 = __pop_Variant100(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action473::<>(__sym0); - __symbols.push((__start, __Symbol::Variant93(__nt), __end)); + __symbols.push((__start, __Symbol::Variant92(__nt), __end)); (1, 236) } pub(crate) fn __reduce659< @@ -33364,11 +33353,11 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant101(__symbols); + let __sym0 = __pop_Variant100(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action474::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant93(__nt), __end)); + __symbols.push((__start, __Symbol::Variant92(__nt), __end)); (3, 236) } pub(crate) fn __reduce660< @@ -33379,11 +33368,11 @@ mod __parse__Top { ) -> (usize, usize) { // ParameterDef = UntypedParameter => ActionFn(463); - let __sym0 = __pop_Variant101(__symbols); + let __sym0 = __pop_Variant100(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action463::<>(__sym0); - __symbols.push((__start, __Symbol::Variant93(__nt), __end)); + __symbols.push((__start, __Symbol::Variant92(__nt), __end)); (1, 237) } pub(crate) fn __reduce661< @@ -33397,11 +33386,11 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant101(__symbols); + let __sym0 = __pop_Variant100(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action464::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant93(__nt), __end)); + __symbols.push((__start, __Symbol::Variant92(__nt), __end)); (3, 237) } pub(crate) fn __reduce662< @@ -33412,11 +33401,11 @@ mod __parse__Top { ) -> (usize, usize) { // ParameterDefs = ParameterDef => ActionFn(1582); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1582::<>(__sym0); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (1, 238) } pub(crate) fn __reduce663< @@ -33429,11 +33418,11 @@ mod __parse__Top { // ParameterDefs = ParameterDef, ("," ParameterDef)+ => ActionFn(1583); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1583::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (2, 238) } pub(crate) fn __reduce664< @@ -33447,11 +33436,11 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1584::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (3, 238) } pub(crate) fn __reduce665< @@ -33466,11 +33455,11 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1585::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (4, 238) } pub(crate) fn __reduce666< @@ -33485,11 +33474,11 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1586::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (4, 238) } pub(crate) fn __reduce667< @@ -33505,11 +33494,11 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1587::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (5, 238) } pub(crate) fn __reduce668< @@ -33520,11 +33509,11 @@ mod __parse__Top { ) -> (usize, usize) { // ParameterDefs = ParameterDef => ActionFn(1588); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1588::<>(__sym0); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (1, 239) } pub(crate) fn __reduce669< @@ -33537,11 +33526,11 @@ mod __parse__Top { // ParameterDefs = ParameterDef, ("," ParameterDef)+ => ActionFn(1589); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1589::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (2, 239) } pub(crate) fn __reduce670< @@ -33555,11 +33544,11 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1590::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (3, 239) } pub(crate) fn __reduce671< @@ -33574,11 +33563,11 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1591::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (4, 239) } pub(crate) fn __reduce672< @@ -33593,11 +33582,11 @@ mod __parse__Top { let __sym3 = __pop_Variant28(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1592::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (4, 239) } pub(crate) fn __reduce673< @@ -33613,11 +33602,11 @@ mod __parse__Top { let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant28(__symbols); - let __sym0 = __pop_Variant93(__symbols); + let __sym0 = __pop_Variant92(__symbols); let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1593::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant94(__nt), __end)); + __symbols.push((__start, __Symbol::Variant93(__nt), __end)); (5, 239) } pub(crate) fn __reduce810< @@ -33630,7 +33619,7 @@ mod __parse__Top { // ParameterList = KwargParameter, "," => ActionFn(1070); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant84(__symbols); + let __sym0 = __pop_Variant83(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1070::<>(__sym0, __sym1); @@ -33645,7 +33634,7 @@ mod __parse__Top { ) -> (usize, usize) { // ParameterList = KwargParameter => ActionFn(1071); - let __sym0 = __pop_Variant84(__symbols); + let __sym0 = __pop_Variant83(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1071::<>(__sym0); @@ -33662,7 +33651,7 @@ mod __parse__Top { // ParameterList = KwargParameter, "," => ActionFn(1078); assert!(__symbols.len() >= 2); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant84(__symbols); + let __sym0 = __pop_Variant83(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1078::<>(__sym0, __sym1); @@ -33677,7 +33666,7 @@ mod __parse__Top { ) -> (usize, usize) { // ParameterList = KwargParameter => ActionFn(1079); - let __sym0 = __pop_Variant84(__symbols); + let __sym0 = __pop_Variant83(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1079::<>(__sym0); @@ -33770,7 +33759,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action382::<>(__sym0); - __symbols.push((__start, __Symbol::Variant96(__nt), __end)); + __symbols.push((__start, __Symbol::Variant95(__nt), __end)); (1, 248) } pub(crate) fn __reduce974< @@ -33784,7 +33773,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action383::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant96(__nt), __end)); + __symbols.push((__start, __Symbol::Variant95(__nt), __end)); (0, 248) } pub(crate) fn __reduce975< @@ -33972,7 +33961,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action1518::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (0, 252) } pub(crate) fn __reduce986< @@ -33983,11 +33972,11 @@ mod __parse__Top { ) -> (usize, usize) { // Program = FileLine+ => ActionFn(1519); - let __sym0 = __pop_Variant77(__symbols); + let __sym0 = __pop_Variant76(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1519::<>(__sym0); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (1, 252) } pub(crate) fn __reduce987< @@ -34056,7 +34045,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1091::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (3, 254) } pub(crate) fn __reduce991< @@ -34073,7 +34062,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1092::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (2, 254) } pub(crate) fn __reduce992< @@ -34093,7 +34082,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1488::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 254) } pub(crate) fn __reduce993< @@ -34112,7 +34101,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1489::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 254) } pub(crate) fn __reduce994< @@ -34133,7 +34122,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1490::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (6, 254) } pub(crate) fn __reduce995< @@ -34153,7 +34142,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1491::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (5, 254) } pub(crate) fn __reduce996< @@ -34171,7 +34160,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1492::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (3, 254) } pub(crate) fn __reduce997< @@ -34188,7 +34177,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1493::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (2, 254) } pub(crate) fn __reduce998< @@ -34207,7 +34196,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1494::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (4, 254) } pub(crate) fn __reduce999< @@ -34225,7 +34214,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1495::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (3, 254) } pub(crate) fn __reduce1000< @@ -34406,7 +34395,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1352::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (3, 259) } pub(crate) fn __reduce1011< @@ -34425,7 +34414,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1353::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (4, 259) } pub(crate) fn __reduce1012< @@ -34442,7 +34431,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1354::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (2, 259) } pub(crate) fn __reduce1013< @@ -34460,7 +34449,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1355::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (3, 259) } pub(crate) fn __reduce1014< @@ -34480,7 +34469,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1498::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant97(__nt), __end)); + __symbols.push((__start, __Symbol::Variant96(__nt), __end)); (5, 260) } pub(crate) fn __reduce1015< @@ -34501,7 +34490,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym5.2; let __nt = super::__action1499::<>(__sym0, __sym1, __sym2, __sym3, __sym4, __sym5); - __symbols.push((__start, __Symbol::Variant97(__nt), __end)); + __symbols.push((__start, __Symbol::Variant96(__nt), __end)); (6, 260) } pub(crate) fn __reduce1016< @@ -34520,7 +34509,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action1500::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant97(__nt), __end)); + __symbols.push((__start, __Symbol::Variant96(__nt), __end)); (4, 260) } pub(crate) fn __reduce1017< @@ -34540,7 +34529,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym4.2; let __nt = super::__action1501::<>(__sym0, __sym1, __sym2, __sym3, __sym4); - __symbols.push((__start, __Symbol::Variant97(__nt), __end)); + __symbols.push((__start, __Symbol::Variant96(__nt), __end)); (5, 260) } pub(crate) fn __reduce1018< @@ -34551,11 +34540,11 @@ mod __parse__Top { ) -> (usize, usize) { // SingleForComprehension+ = SingleForComprehension => ActionFn(225); - let __sym0 = __pop_Variant97(__symbols); + let __sym0 = __pop_Variant96(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action225::<>(__sym0); - __symbols.push((__start, __Symbol::Variant98(__nt), __end)); + __symbols.push((__start, __Symbol::Variant97(__nt), __end)); (1, 261) } pub(crate) fn __reduce1019< @@ -34567,12 +34556,12 @@ mod __parse__Top { { // SingleForComprehension+ = SingleForComprehension+, SingleForComprehension => ActionFn(226); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant97(__symbols); - let __sym0 = __pop_Variant98(__symbols); + let __sym1 = __pop_Variant96(__symbols); + let __sym0 = __pop_Variant97(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action226::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant98(__nt), __end)); + __symbols.push((__start, __Symbol::Variant97(__nt), __end)); (2, 261) } pub(crate) fn __reduce1020< @@ -34589,7 +34578,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1884::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant99(__nt), __end)); + __symbols.push((__start, __Symbol::Variant98(__nt), __end)); (2, 262) } pub(crate) fn __reduce1021< @@ -34604,7 +34593,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1885::<>(__sym0); - __symbols.push((__start, __Symbol::Variant99(__nt), __end)); + __symbols.push((__start, __Symbol::Variant98(__nt), __end)); (1, 262) } pub(crate) fn __reduce1022< @@ -34615,11 +34604,11 @@ mod __parse__Top { ) -> (usize, usize) { // SliceOp? = SliceOp => ActionFn(233); - let __sym0 = __pop_Variant99(__symbols); + let __sym0 = __pop_Variant98(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action233::<>(__sym0); - __symbols.push((__start, __Symbol::Variant100(__nt), __end)); + __symbols.push((__start, __Symbol::Variant99(__nt), __end)); (1, 263) } pub(crate) fn __reduce1023< @@ -34633,7 +34622,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action234::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant100(__nt), __end)); + __symbols.push((__start, __Symbol::Variant99(__nt), __end)); (0, 263) } pub(crate) fn __reduce1024< @@ -34782,12 +34771,12 @@ mod __parse__Top { { // StarPattern = "*", Identifier => ActionFn(1101); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant73(__symbols); + let __sym1 = __pop_Variant72(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1101::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (2, 266) } pub(crate) fn __reduce1034< @@ -34801,11 +34790,11 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1348::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant101(__nt), __end)); + __symbols.push((__start, __Symbol::Variant100(__nt), __end)); (3, 267) } pub(crate) fn __reduce1035< @@ -34816,11 +34805,11 @@ mod __parse__Top { ) -> (usize, usize) { // StarTypedParameter = Identifier => ActionFn(1349); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1349::<>(__sym0); - __symbols.push((__start, __Symbol::Variant101(__nt), __end)); + __symbols.push((__start, __Symbol::Variant100(__nt), __end)); (1, 267) } pub(crate) fn __reduce1036< @@ -34831,11 +34820,11 @@ mod __parse__Top { ) -> (usize, usize) { // StarTypedParameter? = StarTypedParameter => ActionFn(475); - let __sym0 = __pop_Variant101(__symbols); + let __sym0 = __pop_Variant100(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action475::<>(__sym0); - __symbols.push((__start, __Symbol::Variant102(__nt), __end)); + __symbols.push((__start, __Symbol::Variant101(__nt), __end)); (1, 268) } pub(crate) fn __reduce1037< @@ -34849,7 +34838,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action476::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant102(__nt), __end)); + __symbols.push((__start, __Symbol::Variant101(__nt), __end)); (0, 268) } pub(crate) fn __reduce1038< @@ -34860,11 +34849,11 @@ mod __parse__Top { ) -> (usize, usize) { // Statement = SimpleStatement => ActionFn(9); - let __sym0 = __pop_Variant76(__symbols); + let __sym0 = __pop_Variant75(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action9::<>(__sym0); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (1, 269) } pub(crate) fn __reduce1039< @@ -34879,7 +34868,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action10::<>(__sym0); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (1, 269) } pub(crate) fn __reduce1040< @@ -34890,11 +34879,11 @@ mod __parse__Top { ) -> (usize, usize) { // Statement+ = Statement => ActionFn(347); - let __sym0 = __pop_Variant76(__symbols); + let __sym0 = __pop_Variant75(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action347::<>(__sym0); - __symbols.push((__start, __Symbol::Variant77(__nt), __end)); + __symbols.push((__start, __Symbol::Variant76(__nt), __end)); (1, 270) } pub(crate) fn __reduce1041< @@ -34906,12 +34895,12 @@ mod __parse__Top { { // Statement+ = Statement+, Statement => ActionFn(348); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant76(__symbols); - let __sym0 = __pop_Variant77(__symbols); + let __sym1 = __pop_Variant75(__symbols); + let __sym0 = __pop_Variant76(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action348::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant77(__nt), __end)); + __symbols.push((__start, __Symbol::Variant76(__nt), __end)); (2, 270) } pub(crate) fn __reduce1042< @@ -34938,7 +34927,7 @@ mod __parse__Top { { // Subscript = Test<"all">, ":", Test<"all">, SliceOp => ActionFn(1886); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant99(__symbols); + let __sym3 = __pop_Variant98(__symbols); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); @@ -34957,7 +34946,7 @@ mod __parse__Top { { // Subscript = Test<"all">, ":", SliceOp => ActionFn(1887); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant99(__symbols); + let __sym2 = __pop_Variant98(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant9(__symbols); let __start = __sym0.0; @@ -34975,7 +34964,7 @@ mod __parse__Top { { // Subscript = ":", Test<"all">, SliceOp => ActionFn(1888); assert!(__symbols.len() >= 3); - let __sym2 = __pop_Variant99(__symbols); + let __sym2 = __pop_Variant98(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -34993,7 +34982,7 @@ mod __parse__Top { { // Subscript = ":", SliceOp => ActionFn(1889); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant99(__symbols); + let __sym1 = __pop_Variant98(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; @@ -35143,11 +35132,11 @@ mod __parse__Top { ) -> (usize, usize) { // Suite = SimpleStatement => ActionFn(7); - let __sym0 = __pop_Variant76(__symbols); + let __sym0 = __pop_Variant75(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action7::<>(__sym0); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (1, 273) } pub(crate) fn __reduce1056< @@ -35160,13 +35149,13 @@ mod __parse__Top { // Suite = "\n", Indent, Statement+, Dedent => ActionFn(8); assert!(__symbols.len() >= 4); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant77(__symbols); + let __sym2 = __pop_Variant76(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym3.2; let __nt = super::__action8::<>(__sym0, __sym1, __sym2, __sym3); - __symbols.push((__start, __Symbol::Variant76(__nt), __end)); + __symbols.push((__start, __Symbol::Variant75(__nt), __end)); (4, 273) } pub(crate) fn __reduce1057< @@ -35522,12 +35511,12 @@ mod __parse__Top { { // Top = StartModule, Program => ActionFn(1110); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant76(__symbols); + let __sym1 = __pop_Variant75(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1110::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant103(__nt), __end)); + __symbols.push((__start, __Symbol::Variant102(__nt), __end)); (2, 285) } pub(crate) fn __reduce1080< @@ -35539,12 +35528,12 @@ mod __parse__Top { { // Top = StartInteractive, Program => ActionFn(1111); assert!(__symbols.len() >= 2); - let __sym1 = __pop_Variant76(__symbols); + let __sym1 = __pop_Variant75(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1111::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant103(__nt), __end)); + __symbols.push((__start, __Symbol::Variant102(__nt), __end)); (2, 285) } pub(crate) fn __reduce1081< @@ -35561,7 +35550,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym1.2; let __nt = super::__action1901::<>(__sym0, __sym1); - __symbols.push((__start, __Symbol::Variant103(__nt), __end)); + __symbols.push((__start, __Symbol::Variant102(__nt), __end)); (2, 285) } pub(crate) fn __reduce1082< @@ -35579,7 +35568,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1902::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant103(__nt), __end)); + __symbols.push((__start, __Symbol::Variant102(__nt), __end)); (3, 285) } pub(crate) fn __reduce1083< @@ -35591,14 +35580,14 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, ExceptClause+, "else", ":", Suite, "finally", ":", Suite => ActionFn(1377); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant76(__symbols); + let __sym9 = __pop_Variant75(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant75(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant74(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35616,11 +35605,11 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, ExceptClause+, "else", ":", Suite => ActionFn(1378); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant75(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant74(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35638,11 +35627,11 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, ExceptClause+, "finally", ":", Suite => ActionFn(1379); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant75(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant74(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35660,8 +35649,8 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, ExceptClause+ => ActionFn(1380); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant75(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant74(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35679,14 +35668,14 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, ExceptStarClause+, "else", ":", Suite, "finally", ":", Suite => ActionFn(1381); assert!(__symbols.len() >= 10); - let __sym9 = __pop_Variant76(__symbols); + let __sym9 = __pop_Variant75(__symbols); let __sym8 = __pop_Variant0(__symbols); let __sym7 = __pop_Variant0(__symbols); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant75(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant74(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35704,11 +35693,11 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, ExceptStarClause+, "else", ":", Suite => ActionFn(1382); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant75(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant74(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35726,11 +35715,11 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, ExceptStarClause+, "finally", ":", Suite => ActionFn(1383); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant75(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant74(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35748,8 +35737,8 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, ExceptStarClause+ => ActionFn(1384); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant75(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant74(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35767,10 +35756,10 @@ mod __parse__Top { { // TryStatement = "try", ":", Suite, "finally", ":", Suite => ActionFn(1376); assert!(__symbols.len() >= 6); - let __sym5 = __pop_Variant76(__symbols); + let __sym5 = __pop_Variant75(__symbols); let __sym4 = __pop_Variant0(__symbols); let __sym3 = __pop_Variant0(__symbols); - let __sym2 = __pop_Variant76(__symbols); + let __sym2 = __pop_Variant75(__symbols); let __sym1 = __pop_Variant0(__symbols); let __sym0 = __pop_Variant0(__symbols); let __start = __sym0.0; @@ -35790,11 +35779,11 @@ mod __parse__Top { assert!(__symbols.len() >= 3); let __sym2 = __pop_Variant9(__symbols); let __sym1 = __pop_Variant0(__symbols); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym2.2; let __nt = super::__action1345::<>(__sym0, __sym1, __sym2); - __symbols.push((__start, __Symbol::Variant101(__nt), __end)); + __symbols.push((__start, __Symbol::Variant100(__nt), __end)); (3, 287) } pub(crate) fn __reduce1093< @@ -35805,11 +35794,11 @@ mod __parse__Top { ) -> (usize, usize) { // TypedParameter = Identifier => ActionFn(1346); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1346::<>(__sym0); - __symbols.push((__start, __Symbol::Variant101(__nt), __end)); + __symbols.push((__start, __Symbol::Variant100(__nt), __end)); (1, 287) } pub(crate) fn __reduce1094< @@ -35820,11 +35809,11 @@ mod __parse__Top { ) -> (usize, usize) { // TypedParameter? = TypedParameter => ActionFn(477); - let __sym0 = __pop_Variant101(__symbols); + let __sym0 = __pop_Variant100(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action477::<>(__sym0); - __symbols.push((__start, __Symbol::Variant102(__nt), __end)); + __symbols.push((__start, __Symbol::Variant101(__nt), __end)); (1, 288) } pub(crate) fn __reduce1095< @@ -35838,7 +35827,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action478::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant102(__nt), __end)); + __symbols.push((__start, __Symbol::Variant101(__nt), __end)); (0, 288) } pub(crate) fn __reduce1096< @@ -35853,7 +35842,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action186::<>(__sym0); - __symbols.push((__start, __Symbol::Variant104(__nt), __end)); + __symbols.push((__start, __Symbol::Variant103(__nt), __end)); (1, 289) } pub(crate) fn __reduce1097< @@ -35868,7 +35857,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action187::<>(__sym0); - __symbols.push((__start, __Symbol::Variant104(__nt), __end)); + __symbols.push((__start, __Symbol::Variant103(__nt), __end)); (1, 289) } pub(crate) fn __reduce1098< @@ -35883,7 +35872,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action188::<>(__sym0); - __symbols.push((__start, __Symbol::Variant104(__nt), __end)); + __symbols.push((__start, __Symbol::Variant103(__nt), __end)); (1, 289) } pub(crate) fn __reduce1099< @@ -35894,11 +35883,11 @@ mod __parse__Top { ) -> (usize, usize) { // UntypedParameter = Identifier => ActionFn(1117); - let __sym0 = __pop_Variant73(__symbols); + let __sym0 = __pop_Variant72(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1117::<>(__sym0); - __symbols.push((__start, __Symbol::Variant101(__nt), __end)); + __symbols.push((__start, __Symbol::Variant100(__nt), __end)); (1, 290) } pub(crate) fn __reduce1100< @@ -35909,11 +35898,11 @@ mod __parse__Top { ) -> (usize, usize) { // UntypedParameter? = UntypedParameter => ActionFn(465); - let __sym0 = __pop_Variant101(__symbols); + let __sym0 = __pop_Variant100(__symbols); let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action465::<>(__sym0); - __symbols.push((__start, __Symbol::Variant102(__nt), __end)); + __symbols.push((__start, __Symbol::Variant101(__nt), __end)); (1, 291) } pub(crate) fn __reduce1101< @@ -35927,7 +35916,7 @@ mod __parse__Top { let __start = __lookahead_start.cloned().or_else(|| __symbols.last().map(|s| s.2.clone())).unwrap_or_default(); let __end = __start.clone(); let __nt = super::__action466::<>(&__start, &__end); - __symbols.push((__start, __Symbol::Variant102(__nt), __end)); + __symbols.push((__start, __Symbol::Variant101(__nt), __end)); (0, 291) } pub(crate) fn __reduce1102< @@ -35942,7 +35931,7 @@ mod __parse__Top { let __start = __sym0.0; let __end = __sym0.2; let __nt = super::__action1118::<>(__sym0); - __symbols.push((__start, __Symbol::Variant62(__nt), __end)); + __symbols.push((__start, __Symbol::Variant40(__nt), __end)); (1, 292) } pub(crate) fn __reduce1103< @@ -35954,10 +35943,10 @@ mod __parse__Top { { // WhileStatement = "while", NamedExpressionTest, ":", Suite, "else", ":", Suite => ActionFn(1373); assert!(__symbols.len() >= 7); - let __sym6 = __pop_Variant76(__symbols); + let __sym6 = __pop_Variant75(__symbols); let __sym5 = __pop_Variant0(__symbols); let __sym4 = __pop_Variant0(__symbols); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -35976,7 +35965,7 @@ mod __parse__Top { { // WhileStatement = "while", NamedExpressionTest, ":", Suite => ActionFn(1374); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant9(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -36467,7 +36456,7 @@ mod __parse__Top { { // WithStatement = "async", "with", WithItems, ":", Suite => ActionFn(1126); assert!(__symbols.len() >= 5); - let __sym4 = __pop_Variant76(__symbols); + let __sym4 = __pop_Variant75(__symbols); let __sym3 = __pop_Variant0(__symbols); let __sym2 = __pop_Variant46(__symbols); let __sym1 = __pop_Variant0(__symbols); @@ -36487,7 +36476,7 @@ mod __parse__Top { { // WithStatement = "with", WithItems, ":", Suite => ActionFn(1127); assert!(__symbols.len() >= 4); - let __sym3 = __pop_Variant76(__symbols); + let __sym3 = __pop_Variant75(__symbols); let __sym2 = __pop_Variant0(__symbols); let __sym1 = __pop_Variant46(__symbols); let __sym0 = __pop_Variant0(__symbols); @@ -36634,7 +36623,7 @@ fn __action1< (_, end, _): (TextSize, TextSize, TextSize), ) -> ast::Mod { - ast::ModModule { body, type_ignores: vec![], range: (start..end).into() }.into() + ast::ModModule { body, type_ignores: vec![], range: range_or_phantom(start..end) }.into() } #[allow(clippy::too_many_arguments)] @@ -36646,7 +36635,7 @@ fn __action2< (_, end, _): (TextSize, TextSize, TextSize), ) -> ast::Mod { - ast::ModInteractive { body, range: (start..end).into() }.into() + ast::ModInteractive { body, range: range_or_phantom(start..end) }.into() } #[allow(clippy::too_many_arguments)] @@ -36659,7 +36648,7 @@ fn __action3< (_, end, _): (TextSize, TextSize, TextSize), ) -> ast::Mod { - ast::ModExpression { body: Box::new(body), range: (start..end).into() }.into() + ast::ModExpression { body: Box::new(body), range: range_or_phantom(start..end) }.into() } #[allow(clippy::too_many_arguments)] @@ -36827,9 +36816,7 @@ fn __action20< ) -> ast::Stmt { { - ast::Stmt::new( - ast::StmtKind::Pass(ast::StmtPass { range: (location..end_location).into() }), - ) + ast::Stmt::Pass(ast::StmtPass { range: (location..end_location).into() }) } } @@ -36843,7 +36830,7 @@ fn __action21< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Delete( ast::StmtDelete { targets: targets.into_iter().map(|expr| set_context(expr, ast::ExprContext::Del)).collect(), range: (location..end_location).into() } ) } @@ -36861,7 +36848,7 @@ fn __action22< { // Just an expression, no assignment: if suffix.is_empty() { - ast::Stmt::new( + ast::Stmt::Expr( ast::StmtExpr { value: Box::new(expression), range: (location..end_location).into() } ) } else { @@ -36874,7 +36861,7 @@ fn __action22< let value = Box::new(values.into_iter().next().unwrap()); - ast::Stmt::new( + ast::Stmt::Assign( ast::StmtAssign { targets, value, type_comment: None, range: (location..end_location).into() } ) } @@ -36892,7 +36879,7 @@ fn __action23< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::AugAssign( ast::StmtAugAssign { target: Box::new(set_context(target, ast::ExprContext::Store)), op, @@ -36915,8 +36902,8 @@ fn __action24< ) -> ast::Stmt { { - let simple = matches!(target.node, ast::ExprKind::Name { .. }); - ast::Stmt::new( + let simple = target.is_name_expr(); + ast::Stmt::AnnAssign( ast::StmtAnnAssign { target: Box::new(set_context(target, ast::ExprContext::Store)), annotation: Box::new(annotation), @@ -37145,9 +37132,8 @@ fn __action48< ) -> ast::Stmt { { - ast::Stmt::new( - ast::StmtKind::Break(ast::StmtBreak { range: (location..end_location).into() }), - ) + + ast::Stmt::Break(ast::StmtBreak { range: (location..end_location).into() }) } } @@ -37160,9 +37146,7 @@ fn __action49< ) -> ast::Stmt { { - ast::Stmt::new( - ast::StmtKind::Continue(ast::StmtContinue { range: (location..end_location).into() }), - ) + ast::Stmt::Continue(ast::StmtContinue { range: (location..end_location).into() }) } } @@ -37176,7 +37160,7 @@ fn __action50< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Return( ast::StmtReturn { value: value.map(Box::new), range: (location..end_location).into() } ) } @@ -37191,7 +37175,7 @@ fn __action51< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Expr( ast::StmtExpr { value: Box::new(expression), range: (location..end_location).into() } ) } @@ -37215,7 +37199,7 @@ fn __action53< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Raise( ast::StmtRaise { exc: None, cause: None, range: (location..end_location).into() } ) } @@ -37232,7 +37216,7 @@ fn __action54< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Raise( ast::StmtRaise { exc: Some(Box::new(t)), cause: c.map(|x| Box::new(x.1)), range: (location..end_location).into() } ) } @@ -37248,7 +37232,7 @@ fn __action55< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Import( ast::StmtImport { names, range: (location..end_location).into() } ) } @@ -37267,7 +37251,7 @@ fn __action56< { { let (level, module) = source; - ast::Stmt::new( + ast::Stmt::ImportFrom( ast::StmtImportFrom { level, module, @@ -37354,7 +37338,7 @@ fn __action63< { { // Star import all - vec![ast::Alias::new(ast::AliasData { name: ast::Identifier::new("*"), asname: None, range: (location..end_location).into() })] + vec![ast::Alias { name: ast::Identifier::new("*"), asname: None, range: (location..end_location).into() }] } } @@ -37394,7 +37378,7 @@ fn __action66< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Global( ast::StmtGlobal { names, range: (location..end_location).into() } ) } @@ -37410,7 +37394,7 @@ fn __action67< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Nonlocal( ast::StmtNonlocal { names, range: (location..end_location).into() } ) } @@ -37427,7 +37411,7 @@ fn __action68< ) -> ast::Stmt { { - ast::Stmt::new( + ast::Stmt::Assert( ast::StmtAssert { test: Box::new(test), msg: msg.map(|e| Box::new(e.1)), @@ -37530,7 +37514,7 @@ fn __action77< .last() .unwrap() .end(); - ast::Stmt::new( + ast::Stmt::Match( ast::StmtMatch { subject: Box::new(subject), cases, @@ -37562,7 +37546,7 @@ fn __action78< .last() .unwrap() .end(); - ast::Stmt::new( + ast::Stmt::Match( ast::StmtMatch { subject: Box::new(subject), cases, @@ -37598,9 +37582,9 @@ fn __action79< .end(); let mut subjects = subjects; subjects.insert(0, subject); - ast::Stmt::new( + ast::Stmt::Match( ast::StmtMatch { - subject: Box::new(ast::Expr::new( + subject: Box::new(ast::Expr::Tuple( ast::ExprTuple { elts: subjects, ctx: ast::ExprContext::Load, @@ -37631,7 +37615,7 @@ fn __action80< pattern, guard: guard.map(Box::new), body, - range: (start..end).into() + range: range_or_phantom(start..end) } } } @@ -37657,7 +37641,7 @@ fn __action82< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Pattern { - ast::Pattern::new( + ast::Pattern::MatchSequence( ast::PatternMatchSequence { patterns: vec![pattern], range: (location..end_location).into() @@ -37679,7 +37663,7 @@ fn __action83< { let mut patterns = patterns; patterns.insert(0, pattern); - ast::Pattern::new( + ast::Pattern::MatchSequence( ast::PatternMatchSequence { patterns, range: (location..end_location).into() @@ -37732,7 +37716,7 @@ fn __action87< location, })? } else { - Ok(ast::Pattern::new( + Ok(ast::Pattern::MatchAs( ast::PatternMatchAs { pattern: Some(Box::new(pattern)), name: Some(name), @@ -37764,7 +37748,7 @@ fn __action89< { let mut patterns = patterns; patterns.insert(0, pattern); - ast::Pattern::new( + ast::Pattern::MatchOr( ast::PatternMatchOr { patterns, range: (location..end_location).into() } ) } @@ -37773,78 +37757,64 @@ fn __action89< #[allow(clippy::too_many_arguments)] fn __action90< >( - (_, node, _): (TextSize, ast::PatternKind, TextSize), + (_, node, _): (TextSize, ast::Pattern, TextSize), ) -> ast::Pattern { - ast::Pattern::new( - node, - ) + node } #[allow(clippy::too_many_arguments)] fn __action91< >( - (_, node, _): (TextSize, ast::PatternKind, TextSize), + (_, node, _): (TextSize, ast::Pattern, TextSize), ) -> ast::Pattern { - ast::Pattern::new( - node, - ) + node } #[allow(clippy::too_many_arguments)] fn __action92< >( - (_, node, _): (TextSize, ast::PatternKind, TextSize), + (_, node, _): (TextSize, ast::Pattern, TextSize), ) -> ast::Pattern { - ast::Pattern::new( - node, - ) + node } #[allow(clippy::too_many_arguments)] fn __action93< >( - (_, node, _): (TextSize, ast::PatternKind, TextSize), + (_, node, _): (TextSize, ast::Pattern, TextSize), ) -> ast::Pattern { - ast::Pattern::new( - node, - ) + node } #[allow(clippy::too_many_arguments)] fn __action94< >( - (_, node, _): (TextSize, ast::PatternKind, TextSize), + (_, node, _): (TextSize, ast::Pattern, TextSize), ) -> ast::Pattern { - ast::Pattern::new( - node, - ) + node } #[allow(clippy::too_many_arguments)] fn __action95< >( - (_, node, _): (TextSize, ast::PatternKind, TextSize), + (_, node, _): (TextSize, ast::Pattern, TextSize), ) -> ast::Pattern { - ast::Pattern::new( - node, - ) + node } #[allow(clippy::too_many_arguments)] fn __action96< >( - (_, node, _): (TextSize, ast::PatternKind, TextSize), + (_, node, _): (TextSize, ast::Pattern, TextSize), ) -> ast::Pattern { - ast::Pattern::new( - node, - ) + node } #[allow(clippy::too_many_arguments)] @@ -37855,9 +37825,9 @@ fn __action97< (_, pattern, _): (TextSize, ast::Pattern, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { - pattern.node + pattern } #[allow(clippy::too_many_arguments)] @@ -37867,7 +37837,7 @@ fn __action98< (_, _, _): (TextSize, token::Tok, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchSequence { patterns: vec![], @@ -37885,7 +37855,7 @@ fn __action99< (_, patterns, _): (TextSize, Vec, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { let mut patterns = patterns; @@ -37905,7 +37875,7 @@ fn __action100< (_, patterns, _): (TextSize, Vec, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchSequence { patterns, @@ -37920,7 +37890,7 @@ fn __action101< (_, _, _): (TextSize, token::Tok, TextSize), (_, name, _): (TextSize, ast::Identifier, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchStar { name: if name.as_str() == "_" { None } else { Some(name) }, @@ -37936,7 +37906,7 @@ fn __action102< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Constant( ast::ExprConstant { value, kind: None, range: (location..end_location).into() } ) } @@ -37959,7 +37929,7 @@ fn __action104< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::UnaryOp( ast::ExprUnaryOp { op: ast::Unaryop::USub, operand: Box::new(operand), @@ -37978,7 +37948,7 @@ fn __action105< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(left), op, @@ -37994,7 +37964,7 @@ fn __action106< (_, location, _): (TextSize, TextSize, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchSingleton { value: ast::Constant::None, @@ -38008,7 +37978,7 @@ fn __action107< (_, location, _): (TextSize, TextSize, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchSingleton { value: true.into(), @@ -38022,7 +37992,7 @@ fn __action108< (_, location, _): (TextSize, TextSize, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchSingleton { value: false.into(), @@ -38036,7 +38006,7 @@ fn __action109< (_, location, _): (TextSize, TextSize, TextSize), (_, value, _): (TextSize, ast::Expr, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchValue { value: Box::new(value), @@ -38050,7 +38020,7 @@ fn __action110< (_, location, _): (TextSize, TextSize, TextSize), (_, value, _): (TextSize, ast::Expr, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchValue { value: Box::new(value), @@ -38064,7 +38034,7 @@ fn __action111< (_, location, _): (TextSize, TextSize, TextSize), (_, s, _): (TextSize, alloc::vec::Vec<(TextSize, (String, StringKind, bool), TextSize)>, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> Result> +) -> Result> { Ok(ast::PatternMatchValue { value: Box::new(parse_strings(s)?), @@ -38078,7 +38048,7 @@ fn __action112< (_, location, _): (TextSize, TextSize, TextSize), (_, name, _): (TextSize, ast::Identifier, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchAs { pattern: None, @@ -38095,7 +38065,7 @@ fn __action113< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Name( ast::ExprName { id: name, ctx: ast::ExprContext::Load, range: (location..end_location).into() }, ) } @@ -38110,7 +38080,7 @@ fn __action114< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Attribute( ast::ExprAttribute { value: Box::new(name), attr, @@ -38130,7 +38100,7 @@ fn __action115< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Attribute( ast::ExprAttribute { value: Box::new(e), attr, @@ -38146,7 +38116,7 @@ fn __action116< (_, location, _): (TextSize, TextSize, TextSize), (_, e, _): (TextSize, ast::Expr, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { ast::PatternMatchValue { value: Box::new(e), @@ -38189,7 +38159,7 @@ fn __action120< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Constant( ast::ExprConstant { value: ast::Constant::None, kind: None, @@ -38206,7 +38176,7 @@ fn __action121< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Constant( ast::ExprConstant { value: true.into(), kind: None, @@ -38223,7 +38193,7 @@ fn __action122< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Constant( ast::ExprConstant { value: false.into(), kind: None, @@ -38260,7 +38230,7 @@ fn __action125< (_, _, _): (TextSize, token::Tok, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { return ast::PatternMatchMapping { @@ -38281,7 +38251,7 @@ fn __action126< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { let (keys, patterns) = e @@ -38306,7 +38276,7 @@ fn __action127< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { return ast::PatternMatchMapping { @@ -38330,7 +38300,7 @@ fn __action128< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { let (keys, patterns) = e @@ -38368,7 +38338,7 @@ fn __action130< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { let (kwd_attrs, kwd_patterns) = kwds @@ -38394,7 +38364,7 @@ fn __action131< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { ast::PatternMatchClass { @@ -38417,7 +38387,7 @@ fn __action132< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { let (kwd_attrs, kwd_patterns) = kwds @@ -38441,7 +38411,7 @@ fn __action133< (_, _, _): (TextSize, token::Tok, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { ast::PatternMatchClass { @@ -38466,7 +38436,7 @@ fn __action134< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { let (kwd_attrs, kwd_patterns) = kwds @@ -38492,7 +38462,7 @@ fn __action135< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { ast::PatternMatchClass { @@ -38515,7 +38485,7 @@ fn __action136< (_, _, _): (TextSize, core::option::Option, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { let (kwd_attrs, kwd_patterns) = kwds @@ -38539,7 +38509,7 @@ fn __action137< (_, _, _): (TextSize, token::Tok, TextSize), (_, _, _): (TextSize, token::Tok, TextSize), (_, end_location, _): (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { { ast::PatternMatchClass { @@ -38575,13 +38545,13 @@ fn __action138< .end(); // handle elif: for i in s2.into_iter().rev() { - let x = ast::Stmt::new( + let x = ast::Stmt::If( ast::StmtIf { test: Box::new(i.2), body: i.4, orelse: last, range: (i.0..end_location).into() } ); last = vec![x]; } - ast::Stmt::new( + ast::Stmt::If( ast::StmtIf { test: Box::new(test), body, orelse: last, range: (location..end_location).into() } ) } @@ -38605,7 +38575,7 @@ fn __action139< .or_else(|| body.last()) .unwrap() .end(); - ast::Stmt::new( + ast::Stmt::While( ast::StmtWhile { test: Box::new(test), body, @@ -38640,12 +38610,11 @@ fn __action140< let target = Box::new(set_context(target, ast::ExprContext::Store)); let iter = Box::new(iter); let type_comment = None; - let node: ast::StmtKind = if is_async.is_some() { - ast::StmtAsyncFor { target, iter, body, orelse, type_comment, range: (location..end_location).into() }.into() + if is_async.is_some() { + ast::Stmt::AsyncFor(ast::StmtAsyncFor { target, iter, body, orelse, type_comment, range: (location..end_location).into() }) } else { - ast::StmtFor { target, iter, body, orelse, type_comment, range: (location..end_location).into() }.into() - }; - ast::Stmt::new(node) + ast::Stmt::For(ast::StmtFor { target, iter, body, orelse, type_comment, range: (location..end_location).into() }) + } } } @@ -38671,7 +38640,7 @@ fn __action141< .or_else(|| orelse.last().map(|last| last.end())) .or_else(|| handlers.last().map(|last| last.end())) .unwrap(); - ast::Stmt::new( + ast::Stmt::Try( ast::StmtTry { body, handlers, @@ -38705,7 +38674,7 @@ fn __action142< .map(|last| last.end()) .or_else(|| handlers.last().map(|last| last.end())) .unwrap(); - ast::Stmt::new( + ast::Stmt::TryStar( ast::StmtTryStar { body, handlers, @@ -38732,7 +38701,7 @@ fn __action143< let orelse = vec![]; let finalbody = finally.2; let end_location = finalbody.last().unwrap().end(); - ast::Stmt::new( + ast::Stmt::Try( ast::StmtTry { body, handlers, @@ -38757,7 +38726,7 @@ fn __action144< { { let end_location = body.last().unwrap().end(); - ast::Excepthandler::new( + ast::Excepthandler::ExceptHandler( ast::ExcepthandlerExceptHandler { type_: Some(Box::new(typ)), name: None, @@ -38781,7 +38750,7 @@ fn __action145< { { let end_location = body.last().unwrap().end(); - ast::Excepthandler::new( + ast::Excepthandler::ExceptHandler( ast::ExcepthandlerExceptHandler { type_: Some(Box::new(x.0)), name: Some(x.2), @@ -38804,7 +38773,7 @@ fn __action146< { { let end_location = body.last().unwrap().end(); - ast::Excepthandler::new( + ast::Excepthandler::ExceptHandler( ast::ExcepthandlerExceptHandler { type_: typ.map(Box::new), name: None, @@ -38827,7 +38796,7 @@ fn __action147< { { let end_location = body.last().unwrap().end(); - ast::Excepthandler::new( + ast::Excepthandler::ExceptHandler( ast::ExcepthandlerExceptHandler { type_: Some(Box::new(x.0)), name: Some(x.2), @@ -38852,12 +38821,11 @@ fn __action148< { let end_location = body.last().unwrap().end(); let type_comment = None; - let node: ast::StmtKind = if is_async.is_some() { + if is_async.is_some() { ast::StmtAsyncWith { items, body, type_comment, range: (location..end_location).into() }.into() } else { ast::StmtWith { items, body, type_comment, range: (location..end_location).into() }.into() - }; - ast::Stmt::new(node) + } } } @@ -38919,7 +38887,7 @@ fn __action153< ) -> Vec { { - all.into_iter().map(|context_expr| ast::Withitem { context_expr, optional_vars: None, range: (location..end_location).into() }).collect() + all.into_iter().map(|context_expr| ast::Withitem { context_expr, optional_vars: None, range: range_or_phantom(location..end_location) }).collect() } } @@ -38942,12 +38910,11 @@ fn __action154< let returns = r.map(|x| Box::new(x.1)); let end_location = body.last().unwrap().end(); let type_comment = None; - let node: ast::StmtKind = if is_async.is_some() { + if is_async.is_some() { ast::StmtAsyncFunctionDef { name, args, body, decorator_list, returns, type_comment, range: (location..end_location).into() }.into() } else { ast::StmtFunctionDef { name, args, body, decorator_list, returns, type_comment, range: (location..end_location).into() }.into() - }; - ast::Stmt::new(node) + } } } @@ -38971,7 +38938,7 @@ fn __action155< kw_defaults: vec![], kwarg: None, defaults: vec![], - range: (location..end_location).into() + range: range_or_phantom(location..end_location) }) )?; @@ -38987,9 +38954,7 @@ fn __action156< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Arg { - ast::Arg::new( - ast::ArgData { arg, annotation: None, type_comment: None, range: (location..end_location).into() }, - ) + ast::Arg { arg, annotation: None, type_comment: None, range: (location..end_location).into() } } #[allow(clippy::too_many_arguments)] @@ -39003,7 +38968,7 @@ fn __action157< { { let annotation = a.map(|x| Box::new(x.1)); - ast::Arg::new(ast::ArgData { arg, annotation, type_comment: None, range: (location..end_location).into() }) + ast::Arg { arg, annotation, type_comment: None, range: (location..end_location).into() } } } @@ -39018,7 +38983,7 @@ fn __action158< { { let annotation = a.map(|x| Box::new(x.1)); - ast::Arg::new(ast::ArgData { arg, annotation, type_comment: None, range: (location..end_location).into() }) + ast::Arg { arg, annotation, type_comment: None, range: (location..end_location).into() } } } @@ -39040,7 +39005,7 @@ fn __action159< None => (vec![], vec![]), }; let end_location = body.last().unwrap().end(); - ast::Stmt::new( + ast::Stmt::ClassDef( ast::StmtClassDef { name, bases, @@ -39076,7 +39041,7 @@ fn __action161< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Yield( ast::ExprYield { value: value.map(Box::new), range: (location..end_location).into() } ) } @@ -39091,7 +39056,7 @@ fn __action162< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::YieldFrom( ast::ExprYieldFrom { value: Box::new(e), range: (location..end_location).into() } ) } @@ -39125,9 +39090,9 @@ fn __action165< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::NamedExpr( ast::ExprNamedExpr { - target: Box::new(ast::Expr::new( + target: Box::new(ast::Expr::Name( ast::ExprName { id, ctx: ast::ExprContext::Store, range: (location..end_location).into() }, )), range: (location..value.end()).into(), @@ -39159,12 +39124,12 @@ fn __action166< kw_defaults: vec![], kwarg: None, defaults: vec![], - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } } ))?; - Ok(ast::Expr::new( + Ok(ast::Expr::Lambda( ast::ExprLambda { args: Box::new(p), body: Box::new(body), @@ -39393,7 +39358,7 @@ fn __action189< dims.push(x.1) } - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts: dims, ctx: ast::ExprContext::Load, range: (location..end_location).into() }, ) } @@ -39424,7 +39389,7 @@ fn __action191< let lower = e1.map(Box::new); let upper = e2.map(Box::new); let step = e3.flatten().map(Box::new); - ast::Expr::new( + ast::Expr::Slice( ast::ExprSlice { lower, upper, step, range: (location..end_location).into() } ) } @@ -39556,7 +39521,7 @@ fn __action204< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Starred( ast::ExprStarred { value: Box::new(e), ctx: ast::ExprContext::Load, range: (location..end_location).into() }, ) } @@ -39590,7 +39555,7 @@ fn __action206< iter, ifs, is_async, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } } } @@ -39637,7 +39602,7 @@ fn __action210< { { let expr = match c { - Some(c) => ast::Expr::new( + Some(c) => ast::Expr::GeneratorExp( ast::ExprGeneratorExp { elt: Box::new(e), generators: c, @@ -39673,7 +39638,7 @@ fn __action212< ) -> (Option<(TextSize, TextSize, Option)>, ast::Expr) { { - let expr = ast::Expr::new( + let expr = ast::Expr::Starred( ast::ExprStarred { value: Box::new(e), ctx: ast::ExprContext::Load, range: (location..end_location).into() }, ); (None, expr) @@ -39792,7 +39757,7 @@ fn __action223< { let mut values = vec![e1]; values.extend(e2.into_iter().map(|e| e.1)); - ast::Expr::new( + ast::Expr::BoolOp( ast::ExprBoolOp { op: ast::Boolop::Or, values, range: (location..end_location).into() } ) } @@ -39839,7 +39804,7 @@ fn __action227< if elts.len() == 1 && trailing_comma.is_none() { elts.into_iter().next().unwrap() } else { - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -39873,7 +39838,7 @@ fn __action229< if elts.len() == 1 && trailing_comma.is_none() { elts.into_iter().next().unwrap() } else { - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -39890,7 +39855,7 @@ fn __action230< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitOr, right: Box::new(e2), range: (location..end_location).into() } ) } @@ -40009,7 +39974,7 @@ fn __action240< kwarg, defaults, kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) }) } } @@ -40041,7 +40006,7 @@ fn __action241< kwarg, defaults, kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) }) } } @@ -40065,7 +40030,7 @@ fn __action242< kwarg, defaults: vec![], kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } } } @@ -40088,7 +40053,7 @@ fn __action243< kwarg, defaults: vec![], kw_defaults: vec![], - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } } } @@ -40233,7 +40198,7 @@ fn __action256< kwarg, defaults, kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) }) } } @@ -40265,7 +40230,7 @@ fn __action257< kwarg, defaults, kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) }) } } @@ -40289,7 +40254,7 @@ fn __action258< kwarg, defaults: vec![], kw_defaults, - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } } } @@ -40312,7 +40277,7 @@ fn __action259< kwarg, defaults: vec![], kw_defaults: vec![], - range: (location..end_location).into() + range: range_or_phantom(location..end_location) } } } @@ -40406,7 +40371,7 @@ fn __action268< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Withitem { - ast::Withitem { context_expr, optional_vars: None, range: (location..end_location).into() } + ast::Withitem { context_expr, optional_vars: None, range: range_or_phantom(location..end_location) } } #[allow(clippy::too_many_arguments)] @@ -40421,7 +40386,7 @@ fn __action269< { { let optional_vars = Some(Box::new(set_context(vars, ast::ExprContext::Store))); - ast::Withitem { context_expr, optional_vars, range: (location..end_location).into() } + ast::Withitem { context_expr, optional_vars, range: range_or_phantom(location..end_location) } } } @@ -40462,7 +40427,7 @@ fn __action273< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Withitem { - ast::Withitem { context_expr, optional_vars: None, range: (location..end_location).into() } + ast::Withitem { context_expr, optional_vars: None, range: range_or_phantom(location..end_location) } } #[allow(clippy::too_many_arguments)] @@ -40477,7 +40442,7 @@ fn __action274< { { let optional_vars = Some(Box::new(set_context(vars, ast::ExprContext::Store))); - ast::Withitem { context_expr, optional_vars, range: (location..end_location).into() } + ast::Withitem { context_expr, optional_vars, range: range_or_phantom(location..end_location) } } } @@ -40493,7 +40458,7 @@ fn __action275< { { let optional_vars = Some(Box::new(set_context(vars, ast::ExprContext::Store))); - ast::Withitem { context_expr, optional_vars, range: (location..end_location).into() } + ast::Withitem { context_expr, optional_vars, range: range_or_phantom(location..end_location) } } } @@ -40995,7 +40960,7 @@ fn __action323< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Alias { - ast::Alias::new(ast::AliasData { name, asname: a.map(|a| a.1), range: (location..end_location).into() }) + ast::Alias { name, asname: a.map(|a| a.1), range: (location..end_location).into() } } #[allow(clippy::too_many_arguments)] @@ -41059,7 +41024,7 @@ fn __action329< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Alias { - ast::Alias::new(ast::AliasData { name, asname: a.map(|a| a.1), range: (location..end_location).into() }) + ast::Alias { name, asname: a.map(|a| a.1), range: (location..end_location).into() } } #[allow(clippy::too_many_arguments)] @@ -41141,7 +41106,7 @@ fn __action337< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::IfExp( ast::ExprIfExp { test: Box::new(test), body: Box::new(body), @@ -41707,7 +41672,7 @@ fn __action395< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::IfExp( ast::ExprIfExp { test: Box::new(test), body: Box::new(body), @@ -42061,7 +42026,7 @@ fn __action423< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitXor, right: Box::new(e2), range: (location..end_location).into() } ) } @@ -42159,7 +42124,7 @@ fn __action432< { let mut values = vec![e1]; values.extend(e2.into_iter().map(|e| e.1)); - ast::Expr::new( + ast::Expr::BoolOp( ast::ExprBoolOp { op: ast::Boolop::And, values, range: (location..end_location).into() } ) } @@ -42298,7 +42263,7 @@ fn __action446< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::UnaryOp( ast::ExprUnaryOp { operand: Box::new(e), op: ast::Unaryop::Not, range: (location..end_location).into() } ) } @@ -42370,7 +42335,7 @@ fn __action453< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitAnd, right: Box::new(e2), range: (location..end_location).into() } ) } @@ -42655,7 +42620,7 @@ fn __action481< { let mut values = vec![e1]; values.extend(e2.into_iter().map(|e| e.1)); - ast::Expr::new( + ast::Expr::BoolOp( ast::ExprBoolOp { op: ast::Boolop::Or, values, range: (location..end_location).into() } ) } @@ -42834,7 +42799,7 @@ fn __action499< { let mut values = vec![e1]; values.extend(e2.into_iter().map(|e| e.1)); - ast::Expr::new( + ast::Expr::BoolOp( ast::ExprBoolOp { op: ast::Boolop::And, values, range: (location..end_location).into() } ) } @@ -42897,7 +42862,7 @@ fn __action505< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op, right: Box::new(e2), range: (location..end_location).into() } ) } @@ -42941,7 +42906,7 @@ fn __action509< { { let (ops, comparators) = comparisons.into_iter().unzip(); - ast::Expr::new( + ast::Expr::Compare( ast::ExprCompare { left: Box::new(left), ops, comparators, range: (location..end_location).into() } ) } @@ -42995,7 +42960,7 @@ fn __action514< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(a), op, right: Box::new(b), range: (location..end_location).into() } ) } @@ -43018,7 +42983,7 @@ fn __action516< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::UnaryOp( ast::ExprUnaryOp { operand: Box::new(e), op: ast::Unaryop::Not, range: (location..end_location).into() } ) } @@ -43043,7 +43008,7 @@ fn __action518< { { let (ops, comparators) = comparisons.into_iter().unzip(); - ast::Expr::new( + ast::Expr::Compare( ast::ExprCompare { left: Box::new(left), ops, comparators, range: (location..end_location).into() } ) } @@ -43068,7 +43033,7 @@ fn __action520< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(a), op, right: Box::new(b), range: (location..end_location).into() } ) } @@ -43091,7 +43056,7 @@ fn __action522< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::UnaryOp( ast::ExprUnaryOp { operand: Box::new(e), op, range: (location..end_location).into() } ) } @@ -43115,7 +43080,7 @@ fn __action524< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitOr, right: Box::new(e2), range: (location..end_location).into() } ) } @@ -43139,7 +43104,7 @@ fn __action526< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitXor, right: Box::new(e2), range: (location..end_location).into() } ) } @@ -43163,7 +43128,7 @@ fn __action528< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e), op: ast::Operator::Pow, right: Box::new(b), range: (location..end_location).into() } ) } @@ -43187,7 +43152,7 @@ fn __action530< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::Await( ast::ExprAwait { value: Box::new(atom), range: (location..end_location).into() } ) } @@ -43212,7 +43177,7 @@ fn __action532< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op: ast::Operator::BitAnd, right: Box::new(e2), range: (location..end_location).into() } ) } @@ -43236,7 +43201,7 @@ fn __action534< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e1), op, right: Box::new(e2), range: (location..end_location).into() } ) } @@ -43271,7 +43236,7 @@ fn __action537< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::Call( ast::ExprCall { func: Box::new(f), args: a.args, keywords: a.keywords, range: (location..end_location).into() } ) } @@ -43288,7 +43253,7 @@ fn __action538< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Subscript( ast::ExprSubscript { value: Box::new(e), slice: Box::new(s), ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43303,7 +43268,7 @@ fn __action539< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Attribute( ast::ExprAttribute { value: Box::new(e), attr, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43326,7 +43291,7 @@ fn __action541< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Constant( ast::ExprConstant { value, kind: None, range: (location..end_location).into() } ) } @@ -43339,7 +43304,7 @@ fn __action542< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Name( ast::ExprName { id: name, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43356,7 +43321,7 @@ fn __action543< { { let elts = e.unwrap_or_default(); - ast::Expr::new( + ast::Expr::List( ast::ExprList { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43374,7 +43339,7 @@ fn __action544< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::ListComp( ast::ExprListComp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) } @@ -43395,7 +43360,7 @@ fn __action545< if elts.len() == 1 && trailing_comma.is_none() { elts.into_iter().next().unwrap() } else { - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43417,7 +43382,7 @@ fn __action546< { { if left.is_none() && right.is_empty() && trailing_comma.is_none() { - if matches!(mid.node, ast::ExprKind::Starred { .. }) { + if mid.is_starred_expr() { Err(LexicalError{ error: LexicalErrorType::OtherError("cannot use starred expression here".to_string()), location: mid.start(), @@ -43426,7 +43391,7 @@ fn __action546< Ok(mid) } else { let elts = left.into_iter().flatten().chain([mid]).chain(right).collect(); - Ok(ast::Expr::new( + Ok(ast::Expr::Tuple( ast::ExprTuple { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() }, )) } @@ -43442,7 +43407,7 @@ fn __action547< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts: Vec::new(), ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43470,7 +43435,7 @@ fn __action549< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::GeneratorExp( ast::ExprGeneratorExp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) } @@ -43511,7 +43476,7 @@ fn __action551< .into_iter() .map(|(k, v)| (k.map(|x| *x), v)) .unzip(); - ast::Expr::new( + ast::Expr::Dict( ast::ExprDict { keys, values, range: (location..end_location).into() } ) } @@ -43529,7 +43494,7 @@ fn __action552< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::DictComp( ast::ExprDictComp { key: Box::new(e1.0), value: Box::new(e1.1), @@ -43550,7 +43515,7 @@ fn __action553< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Set( ast::ExprSet { elts, range: (location..end_location).into() } ) } @@ -43567,7 +43532,7 @@ fn __action554< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::SetComp( ast::ExprSetComp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) } @@ -43581,7 +43546,7 @@ fn __action555< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new(ast::ExprConstant { value: true.into(), kind: None, range: (location..end_location).into() }) + ast::Expr::Constant(ast::ExprConstant { value: true.into(), kind: None, range: (location..end_location).into() }) } #[allow(clippy::too_many_arguments)] @@ -43592,7 +43557,7 @@ fn __action556< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new(ast::ExprConstant { value: false.into(), kind: None, range: (location..end_location).into() }) + ast::Expr::Constant(ast::ExprConstant { value: false.into(), kind: None, range: (location..end_location).into() }) } #[allow(clippy::too_many_arguments)] @@ -43603,7 +43568,7 @@ fn __action557< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new(ast::ExprConstant { value: ast::Constant::None, kind: None, range: (location..end_location).into() }) + ast::Expr::Constant(ast::ExprConstant { value: ast::Constant::None, kind: None, range: (location..end_location).into() }) } #[allow(clippy::too_many_arguments)] @@ -43614,7 +43579,7 @@ fn __action558< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new(ast::ExprConstant { value: ast::Constant::Ellipsis, kind: None, range: (location..end_location).into() }) + ast::Expr::Constant(ast::ExprConstant { value: ast::Constant::Ellipsis, kind: None, range: (location..end_location).into() }) } #[allow(clippy::too_many_arguments)] @@ -43627,7 +43592,7 @@ fn __action559< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(a), op, right: Box::new(b), range: (location..end_location).into() } ) } @@ -43651,7 +43616,7 @@ fn __action561< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(a), op, right: Box::new(b), range: (location..end_location).into() } ) } @@ -43789,7 +43754,7 @@ fn __action575< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::UnaryOp( ast::ExprUnaryOp { operand: Box::new(e), op, range: (location..end_location).into() } ) } @@ -43813,7 +43778,7 @@ fn __action577< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::BinOp( ast::ExprBinOp { left: Box::new(e), op: ast::Operator::Pow, right: Box::new(b), range: (location..end_location).into() } ) } @@ -43837,7 +43802,7 @@ fn __action579< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::Await( ast::ExprAwait { value: Box::new(atom), range: (location..end_location).into() } ) } @@ -43873,7 +43838,7 @@ fn __action582< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::Call( ast::ExprCall { func: Box::new(f), args: a.args, keywords: a.keywords, range: (location..end_location).into() } ) } @@ -43890,7 +43855,7 @@ fn __action583< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Subscript( ast::ExprSubscript { value: Box::new(e), slice: Box::new(s), ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43905,7 +43870,7 @@ fn __action584< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Attribute( ast::ExprAttribute { value: Box::new(e), attr, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43928,7 +43893,7 @@ fn __action586< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Constant( ast::ExprConstant { value, kind: None, range: (location..end_location).into() } ) } @@ -43941,7 +43906,7 @@ fn __action587< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Name( ast::ExprName { id: name, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43958,7 +43923,7 @@ fn __action588< { { let elts = e.unwrap_or_default(); - ast::Expr::new( + ast::Expr::List( ast::ExprList { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -43976,7 +43941,7 @@ fn __action589< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::ListComp( ast::ExprListComp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) } @@ -43997,7 +43962,7 @@ fn __action590< { { if left.is_none() && right.is_empty() && trailing_comma.is_none() { - if matches!(mid.node, ast::ExprKind::Starred { .. }) { + if mid.is_starred_expr() { Err(LexicalError{ error: LexicalErrorType::OtherError("cannot use starred expression here".to_string()), location: mid.start(), @@ -44006,7 +43971,7 @@ fn __action590< Ok(mid) } else { let elts = left.into_iter().flatten().chain([mid]).chain(right).collect(); - Ok(ast::Expr::new( + Ok(ast::Expr::Tuple( ast::ExprTuple { elts, ctx: ast::ExprContext::Load, range: (location..end_location).into() }, )) } @@ -44022,7 +43987,7 @@ fn __action591< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Tuple( ast::ExprTuple { elts: Vec::new(), ctx: ast::ExprContext::Load, range: (location..end_location).into() } ) } @@ -44050,7 +44015,7 @@ fn __action593< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::GeneratorExp( ast::ExprGeneratorExp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) } @@ -44091,7 +44056,7 @@ fn __action595< .into_iter() .map(|(k, v)| (k.map(|x| *x), v)) .unzip(); - ast::Expr::new( + ast::Expr::Dict( ast::ExprDict { keys, values, range: (location..end_location).into() } ) } @@ -44109,7 +44074,7 @@ fn __action596< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::DictComp( ast::ExprDictComp { key: Box::new(e1.0), value: Box::new(e1.1), @@ -44130,7 +44095,7 @@ fn __action597< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new( + ast::Expr::Set( ast::ExprSet { elts, range: (location..end_location).into() } ) } @@ -44147,7 +44112,7 @@ fn __action598< ) -> ast::Expr { { - ast::Expr::new( + ast::Expr::SetComp( ast::ExprSetComp { elt: Box::new(elt), generators, range: (location..end_location).into() } ) } @@ -44161,7 +44126,7 @@ fn __action599< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new(ast::ExprConstant { value: true.into(), kind: None, range: (location..end_location).into() }) + ast::Expr::Constant(ast::ExprConstant { value: true.into(), kind: None, range: (location..end_location).into() }) } #[allow(clippy::too_many_arguments)] @@ -44172,7 +44137,7 @@ fn __action600< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new(ast::ExprConstant { value: false.into(), kind: None, range: (location..end_location).into() }) + ast::Expr::Constant(ast::ExprConstant { value: false.into(), kind: None, range: (location..end_location).into() }) } #[allow(clippy::too_many_arguments)] @@ -44183,7 +44148,7 @@ fn __action601< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new(ast::ExprConstant { value: ast::Constant::None, kind: None, range: (location..end_location).into() }) + ast::Expr::Constant(ast::ExprConstant { value: ast::Constant::None, kind: None, range: (location..end_location).into() }) } #[allow(clippy::too_many_arguments)] @@ -44194,7 +44159,7 @@ fn __action602< (_, end_location, _): (TextSize, TextSize, TextSize), ) -> ast::Expr { - ast::Expr::new(ast::ExprConstant { value: ast::Constant::Ellipsis, kind: None, range: (location..end_location).into() }) + ast::Expr::Constant(ast::ExprConstant { value: ast::Constant::Ellipsis, kind: None, range: (location..end_location).into() }) } #[allow(clippy::too_many_arguments)] @@ -44387,7 +44352,7 @@ fn __action609< __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), __8: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __6.0; let __end0 = __6.2; @@ -44419,7 +44384,7 @@ fn __action610< __5: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __6.0; @@ -44451,7 +44416,7 @@ fn __action611< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -44479,7 +44444,7 @@ fn __action612< __3: (TextSize, Vec, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __4.0; @@ -44509,7 +44474,7 @@ fn __action613< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -44537,7 +44502,7 @@ fn __action614< __3: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __4.0; @@ -44569,7 +44534,7 @@ fn __action615< __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), __8: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __6.0; let __end0 = __6.2; @@ -44601,7 +44566,7 @@ fn __action616< __5: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __6.0; @@ -44633,7 +44598,7 @@ fn __action617< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -44661,7 +44626,7 @@ fn __action618< __3: (TextSize, Vec, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __4.0; @@ -44691,7 +44656,7 @@ fn __action619< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -44719,7 +44684,7 @@ fn __action620< __3: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __4.0; @@ -45008,7 +44973,7 @@ fn __action633< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.0; let __end0 = __3.2; @@ -45034,7 +44999,7 @@ fn __action634< __2: (TextSize, Vec<(ast::Expr, ast::Pattern)>, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.2; let __end0 = __3.0; @@ -45063,7 +45028,7 @@ fn __action635< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -45091,7 +45056,7 @@ fn __action636< __3: (TextSize, ast::Identifier, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __4.0; @@ -45123,7 +45088,7 @@ fn __action637< __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), __8: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __6.0; let __end0 = __6.2; @@ -45155,7 +45120,7 @@ fn __action638< __5: (TextSize, ast::Identifier, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, TextSize, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __6.0; @@ -48365,7 +48330,7 @@ fn __action766< >( __0: (TextSize, TextSize, TextSize), __1: (TextSize, ast::Identifier, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.2; let __end0 = __1.2; @@ -48392,7 +48357,7 @@ fn __action767< __5: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __7.2; let __end0 = __7.2; @@ -48424,7 +48389,7 @@ fn __action768< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __6.2; let __end0 = __6.2; @@ -48454,7 +48419,7 @@ fn __action769< __3: (TextSize, Vec, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __5.2; @@ -48482,7 +48447,7 @@ fn __action770< __2: (TextSize, token::Tok, TextSize), __3: (TextSize, Vec, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.2; let __end0 = __4.2; @@ -48510,7 +48475,7 @@ fn __action771< __3: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __5.2; @@ -48538,7 +48503,7 @@ fn __action772< __2: (TextSize, token::Tok, TextSize), __3: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.2; let __end0 = __4.2; @@ -48564,7 +48529,7 @@ fn __action773< __1: (TextSize, ast::Expr, TextSize), __2: (TextSize, token::Tok, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __3.2; @@ -48593,7 +48558,7 @@ fn __action774< __5: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __7.2; let __end0 = __7.2; @@ -48625,7 +48590,7 @@ fn __action775< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __6.2; let __end0 = __6.2; @@ -48655,7 +48620,7 @@ fn __action776< __3: (TextSize, Vec, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __5.2; @@ -48683,7 +48648,7 @@ fn __action777< __2: (TextSize, token::Tok, TextSize), __3: (TextSize, Vec, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.2; let __end0 = __4.2; @@ -48711,7 +48676,7 @@ fn __action778< __3: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __5.2; @@ -48739,7 +48704,7 @@ fn __action779< __2: (TextSize, token::Tok, TextSize), __3: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.2; let __end0 = __4.2; @@ -48765,7 +48730,7 @@ fn __action780< __1: (TextSize, ast::Expr, TextSize), __2: (TextSize, token::Tok, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __3.2; @@ -49580,7 +49545,7 @@ fn __action815< >( __0: (TextSize, TextSize, TextSize), __1: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.2; let __end0 = __1.2; @@ -49601,7 +49566,7 @@ fn __action816< >( __0: (TextSize, TextSize, TextSize), __1: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.2; let __end0 = __1.2; @@ -49622,7 +49587,7 @@ fn __action817< >( __0: (TextSize, TextSize, TextSize), __1: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.2; let __end0 = __1.2; @@ -49643,7 +49608,7 @@ fn __action818< >( __0: (TextSize, TextSize, TextSize), __1: (TextSize, ast::Expr, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.2; let __end0 = __1.2; @@ -49664,7 +49629,7 @@ fn __action819< >( __0: (TextSize, TextSize, TextSize), __1: (TextSize, ast::Expr, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.2; let __end0 = __1.2; @@ -49685,7 +49650,7 @@ fn __action820< >( __0: (TextSize, TextSize, TextSize), __1: (TextSize, alloc::vec::Vec<(TextSize, (String, StringKind, bool), TextSize)>, TextSize), -) -> Result> +) -> Result> { let __start0 = __1.2; let __end0 = __1.2; @@ -49770,7 +49735,7 @@ fn __action824< __0: (TextSize, TextSize, TextSize), __1: (TextSize, token::Tok, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.2; let __end0 = __2.2; @@ -49795,7 +49760,7 @@ fn __action825< __2: (TextSize, Vec<(ast::Expr, ast::Pattern)>, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.2; let __end0 = __4.2; @@ -49821,7 +49786,7 @@ fn __action826< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, Vec<(ast::Expr, ast::Pattern)>, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __3.2; @@ -49848,7 +49813,7 @@ fn __action827< __3: (TextSize, ast::Identifier, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __5.2; @@ -49876,7 +49841,7 @@ fn __action828< __2: (TextSize, token::Tok, TextSize), __3: (TextSize, ast::Identifier, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.2; let __end0 = __4.2; @@ -49906,7 +49871,7 @@ fn __action829< __5: (TextSize, ast::Identifier, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __7.2; let __end0 = __7.2; @@ -49938,7 +49903,7 @@ fn __action830< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, ast::Identifier, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __6.2; let __end0 = __6.2; @@ -50814,7 +50779,7 @@ fn __action867< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, ast::Pattern, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __3.2; @@ -50838,7 +50803,7 @@ fn __action868< __0: (TextSize, TextSize, TextSize), __1: (TextSize, token::Tok, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.2; let __end0 = __2.2; @@ -50864,7 +50829,7 @@ fn __action869< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, Vec, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __5.2; let __end0 = __5.2; @@ -50891,7 +50856,7 @@ fn __action870< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, Vec, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.2; let __end0 = __3.2; @@ -51048,7 +51013,7 @@ fn __action876< __0: (TextSize, TextSize, TextSize), __1: (TextSize, token::Tok, TextSize), __2: (TextSize, ast::Identifier, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.2; let __end0 = __2.2; @@ -51453,7 +51418,7 @@ fn __action892< >( __0: (TextSize, TextSize, TextSize), __1: (TextSize, ast::Expr, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.2; let __end0 = __1.2; @@ -53211,7 +53176,7 @@ fn __action968< fn __action969< >( __0: (TextSize, ast::Identifier, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53296,7 +53261,7 @@ fn __action972< __4: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53326,7 +53291,7 @@ fn __action973< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53354,7 +53319,7 @@ fn __action974< __2: (TextSize, Vec, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53380,7 +53345,7 @@ fn __action975< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, Vec, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53406,7 +53371,7 @@ fn __action976< __2: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53432,7 +53397,7 @@ fn __action977< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53456,7 +53421,7 @@ fn __action978< __0: (TextSize, ast::Expr, TextSize), __1: (TextSize, token::Tok, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53483,7 +53448,7 @@ fn __action979< __4: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53513,7 +53478,7 @@ fn __action980< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53541,7 +53506,7 @@ fn __action981< __2: (TextSize, Vec, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53567,7 +53532,7 @@ fn __action982< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, Vec, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53593,7 +53558,7 @@ fn __action983< __2: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53619,7 +53584,7 @@ fn __action984< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, Vec<(ast::Identifier, ast::Pattern)>, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -53643,7 +53608,7 @@ fn __action985< __0: (TextSize, ast::Expr, TextSize), __1: (TextSize, token::Tok, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54714,7 +54679,7 @@ fn __action1031< fn __action1032< >( __0: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54733,7 +54698,7 @@ fn __action1032< fn __action1033< >( __0: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54752,7 +54717,7 @@ fn __action1033< fn __action1034< >( __0: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54771,7 +54736,7 @@ fn __action1034< fn __action1035< >( __0: (TextSize, ast::Expr, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54790,7 +54755,7 @@ fn __action1035< fn __action1036< >( __0: (TextSize, ast::Expr, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54809,7 +54774,7 @@ fn __action1036< fn __action1037< >( __0: (TextSize, alloc::vec::Vec<(TextSize, (String, StringKind, bool), TextSize)>, TextSize), -) -> Result> +) -> Result> { let __start0 = __0.0; let __end0 = __0.0; @@ -54905,7 +54870,7 @@ fn __action1042< >( __0: (TextSize, token::Tok, TextSize), __1: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54928,7 +54893,7 @@ fn __action1043< __1: (TextSize, Vec<(ast::Expr, ast::Pattern)>, TextSize), __2: (TextSize, token::Tok, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54952,7 +54917,7 @@ fn __action1044< __0: (TextSize, token::Tok, TextSize), __1: (TextSize, Vec<(ast::Expr, ast::Pattern)>, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -54977,7 +54942,7 @@ fn __action1045< __2: (TextSize, ast::Identifier, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -55003,7 +54968,7 @@ fn __action1046< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, ast::Identifier, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -55031,7 +54996,7 @@ fn __action1047< __4: (TextSize, ast::Identifier, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -55061,7 +55026,7 @@ fn __action1048< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, ast::Identifier, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -56049,7 +56014,7 @@ fn __action1091< __0: (TextSize, token::Tok, TextSize), __1: (TextSize, ast::Pattern, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -56071,7 +56036,7 @@ fn __action1092< >( __0: (TextSize, token::Tok, TextSize), __1: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -56095,7 +56060,7 @@ fn __action1093< __2: (TextSize, token::Tok, TextSize), __3: (TextSize, Vec, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -56120,7 +56085,7 @@ fn __action1094< __0: (TextSize, token::Tok, TextSize), __1: (TextSize, Vec, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -56286,7 +56251,7 @@ fn __action1101< >( __0: (TextSize, token::Tok, TextSize), __1: (TextSize, ast::Identifier, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -56684,7 +56649,7 @@ fn __action1117< fn __action1118< >( __0: (TextSize, ast::Expr, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.0; let __end0 = __0.0; @@ -65146,7 +65111,7 @@ fn __action1488< __2: (TextSize, token::Tok, TextSize), __3: (TextSize, ast::Pattern, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.0; let __end0 = __3.2; @@ -65170,7 +65135,7 @@ fn __action1489< __1: (TextSize, ast::Pattern, TextSize), __2: (TextSize, token::Tok, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.2; let __end0 = __3.0; @@ -65197,7 +65162,7 @@ fn __action1490< __3: (TextSize, alloc::vec::Vec, TextSize), __4: (TextSize, ast::Pattern, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.0; let __end0 = __4.2; @@ -65223,7 +65188,7 @@ fn __action1491< __2: (TextSize, token::Tok, TextSize), __3: (TextSize, alloc::vec::Vec, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __3.0; let __end0 = __3.2; @@ -65246,7 +65211,7 @@ fn __action1492< __0: (TextSize, token::Tok, TextSize), __1: (TextSize, ast::Pattern, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __1.2; @@ -65266,7 +65231,7 @@ fn __action1493< >( __0: (TextSize, token::Tok, TextSize), __1: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __0.2; let __end0 = __1.0; @@ -65289,7 +65254,7 @@ fn __action1494< __1: (TextSize, alloc::vec::Vec, TextSize), __2: (TextSize, ast::Pattern, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __2.2; @@ -65311,7 +65276,7 @@ fn __action1495< __0: (TextSize, token::Tok, TextSize), __1: (TextSize, alloc::vec::Vec, TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __1.2; @@ -66748,7 +66713,7 @@ fn __action1558< __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -66778,7 +66743,7 @@ fn __action1559< __5: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __5.2; @@ -66807,7 +66772,7 @@ fn __action1560< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -66835,7 +66800,7 @@ fn __action1561< __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __5.2; @@ -66862,7 +66827,7 @@ fn __action1562< __2: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -66888,7 +66853,7 @@ fn __action1563< __3: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -66913,7 +66878,7 @@ fn __action1564< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -66937,7 +66902,7 @@ fn __action1565< __2: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __3: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -66964,7 +66929,7 @@ fn __action1566< __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -66994,7 +66959,7 @@ fn __action1567< __5: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __5.2; @@ -67023,7 +66988,7 @@ fn __action1568< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __4.2; @@ -67051,7 +67016,7 @@ fn __action1569< __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __4.0; let __end0 = __5.2; @@ -67078,7 +67043,7 @@ fn __action1570< __2: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -67104,7 +67069,7 @@ fn __action1571< __3: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -67129,7 +67094,7 @@ fn __action1572< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -67153,7 +67118,7 @@ fn __action1573< __2: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __3: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -67177,7 +67142,7 @@ fn __action1574< __1: (TextSize, (ast::Expr, ast::Pattern), TextSize), __2: (TextSize, token::Tok, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __1.2; @@ -67201,7 +67166,7 @@ fn __action1575< __2: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Expr, ast::Pattern))>, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __2.2; @@ -67224,7 +67189,7 @@ fn __action1576< __0: (TextSize, token::Tok, TextSize), __1: (TextSize, (ast::Expr, ast::Pattern), TextSize), __2: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __1.2; @@ -67246,7 +67211,7 @@ fn __action1577< __1: (TextSize, (ast::Expr, ast::Pattern), TextSize), __2: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Expr, ast::Pattern))>, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __2.2; @@ -67272,7 +67237,7 @@ fn __action1578< __4: (TextSize, ast::Identifier, TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __1.2; @@ -67302,7 +67267,7 @@ fn __action1579< __5: (TextSize, ast::Identifier, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __2.2; @@ -67331,7 +67296,7 @@ fn __action1580< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, ast::Identifier, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __1.2; @@ -67359,7 +67324,7 @@ fn __action1581< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, ast::Identifier, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __1.0; let __end0 = __2.2; @@ -67644,7 +67609,7 @@ fn __action1594< __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -67674,7 +67639,7 @@ fn __action1595< __5: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -67705,7 +67670,7 @@ fn __action1596< __5: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -67737,7 +67702,7 @@ fn __action1597< __6: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __7: (TextSize, token::Tok, TextSize), __8: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -67767,7 +67732,7 @@ fn __action1598< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -67795,7 +67760,7 @@ fn __action1599< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -67824,7 +67789,7 @@ fn __action1600< __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -67854,7 +67819,7 @@ fn __action1601< __5: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __6: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -67882,7 +67847,7 @@ fn __action1602< __2: (TextSize, ast::Pattern, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -67908,7 +67873,7 @@ fn __action1603< __3: (TextSize, alloc::vec::Vec<(token::Tok, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -67933,7 +67898,7 @@ fn __action1604< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, ast::Pattern, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -67957,7 +67922,7 @@ fn __action1605< __2: (TextSize, ast::Pattern, TextSize), __3: (TextSize, alloc::vec::Vec<(token::Tok, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -67984,7 +67949,7 @@ fn __action1606< __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, token::Tok, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -68014,7 +67979,7 @@ fn __action1607< __5: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -68045,7 +68010,7 @@ fn __action1608< __5: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __6: (TextSize, token::Tok, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -68077,7 +68042,7 @@ fn __action1609< __6: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __7: (TextSize, token::Tok, TextSize), __8: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -68107,7 +68072,7 @@ fn __action1610< __3: (TextSize, token::Tok, TextSize), __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -68135,7 +68100,7 @@ fn __action1611< __4: (TextSize, token::Tok, TextSize), __5: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -68164,7 +68129,7 @@ fn __action1612< __4: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __5: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __6: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -68194,7 +68159,7 @@ fn __action1613< __5: (TextSize, (ast::Identifier, ast::Pattern), TextSize), __6: (TextSize, alloc::vec::Vec<(token::Tok, (ast::Identifier, ast::Pattern))>, TextSize), __7: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -68222,7 +68187,7 @@ fn __action1614< __2: (TextSize, ast::Pattern, TextSize), __3: (TextSize, token::Tok, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -68248,7 +68213,7 @@ fn __action1615< __3: (TextSize, alloc::vec::Vec<(token::Tok, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), __5: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; @@ -68273,7 +68238,7 @@ fn __action1616< __1: (TextSize, token::Tok, TextSize), __2: (TextSize, ast::Pattern, TextSize), __3: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __2.2; @@ -68297,7 +68262,7 @@ fn __action1617< __2: (TextSize, ast::Pattern, TextSize), __3: (TextSize, alloc::vec::Vec<(token::Tok, ast::Pattern)>, TextSize), __4: (TextSize, token::Tok, TextSize), -) -> ast::PatternKind +) -> ast::Pattern { let __start0 = __2.0; let __end0 = __3.2; 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 ab9b250..bea9f37 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 @@ -3,51 +3,39 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: AnnAssign( - StmtAnnAssign { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 0..1, - }, + AnnAssign( + StmtAnnAssign { + target: Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 0..1, }, - annotation: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "int", - ), - ctx: Load, - range: 3..6, - }, + ), + annotation: Name( + ExprName { + id: Identifier( + "int", ), + ctx: Load, + range: 3..6, }, - value: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 9..10, - }, + ), + value: Some( + Constant( + ExprConstant { + value: Int( + 1, ), + kind: None, + range: 9..10, }, ), - simple: true, - range: 0..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 5df3614..42479a5 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap @@ -3,86 +3,65 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 0..1, - }, - ), - }, - attr: Identifier( - "y", + Assign( + StmtAssign { + targets: [ + Attribute( + ExprAttribute { + value: Name( + ExprName { + id: Identifier( + "x", ), - ctx: Store, - range: 0..3, + ctx: Load, + range: 0..1, }, ), + attr: Identifier( + "y", + ), + ctx: Store, + range: 0..3, }, - ], - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 7..8, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 10..11, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 13..14, - }, - ), - }, - ], - ctx: Load, - range: 6..15, - }, - ), + ), + ], + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 7..8, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 10..11, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 13..14, + }, + ), + ], + ctx: Load, + range: 6..15, }, - type_comment: None, - range: 0..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 ec8db68..0cb5f6f 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap @@ -3,83 +3,62 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: For( - StmtFor { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 4..5, - }, + For( + StmtFor { + target: Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 4..5, }, - iter: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 10..11, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 13..14, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 16..17, - }, - ), - }, - ], - ctx: Load, - range: 9..18, - }, - ), - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 20..24, + ), + iter: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 10..11, }, ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 13..14, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 16..17, + }, + ), + ], + ctx: Load, + range: 9..18, + }, + ), + body: [ + Pass( + StmtPass { + range: 20..24, }, - ], - orelse: [], - type_comment: None, - range: 0..24, - }, - ), - }, + ), + ], + 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 088701e..55e736e 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap @@ -3,97 +3,73 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: List( - ExprList { - elts: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 1..2, - }, - ), - }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 4..5, - }, - ), - }, - ], - ctx: Store, - range: 0..6, + Assign( + StmtAssign { + targets: [ + List( + ExprList { + elts: [ + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 1..2, + }, + ), + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 4..5, + }, + ), + ], + ctx: Store, + range: 0..6, + }, + ), + ], + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 10..11, }, ), - }, - ], - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 10..11, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 13..14, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 16..17, - }, - ), - }, - ], - ctx: Load, - range: 9..18, - }, - ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 13..14, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 16..17, + }, + ), + ], + ctx: Load, + range: 9..18, }, - type_comment: None, - range: 0..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 e179aba..60cf1c2 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 @@ -3,113 +3,86 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 0..1, - }, + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 0..1, }, - ], - value: Attributed { - custom: (), - node: ListComp( - ExprListComp { - elt: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 5..6, - }, - ), - }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 11..12, - }, - ), - }, - iter: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 17..18, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 20..21, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 23..24, - }, - ), - }, - ], - ctx: Load, - range: 16..25, - }, - ), - }, - ifs: [], - is_async: false, - range: 7..25, - }, - ], - range: 4..26, + ), + ], + value: ListComp( + ExprListComp { + elt: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Load, + range: 5..6, }, ), + generators: [ + Comprehension { + target: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 11..12, + }, + ), + iter: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 17..18, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 20..21, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 23..24, + }, + ), + ], + ctx: Load, + range: 16..25, + }, + ), + ifs: [], + is_async: false, + range: PhantomData, + }, + ], + range: 4..26, }, - type_comment: None, - range: 0..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 685411a..8531e15 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap @@ -3,74 +3,56 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 0..1, + }, + ), + ], + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, ), - ctx: Store, - range: 0..1, + kind: None, + range: 5..6, }, ), - }, - ], - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 5..6, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 8..9, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 11..12, - }, - ), - }, - ], - ctx: Load, - range: 4..13, - }, - ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 8..9, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 11..12, + }, + ), + ], + ctx: Load, + range: 4..13, }, - type_comment: None, - range: 0..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 45054f5..9adcc6f 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 @@ -3,55 +3,40 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: If( - StmtIf { - test: Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 3..4, - }, - ), - }, - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 7..8, - }, - ), - }, - range: 3..8, + If( + StmtIf { + test: NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 3..4, }, ), + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 7..8, + }, + ), + range: 3..8, }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 10..14, - }, - ), + ), + body: [ + Pass( + StmtPass { + range: 10..14, }, - ], - orelse: [], - range: 0..14, - }, - ), - }, + ), + ], + 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 f44712d..7db8ff6 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 @@ -3,113 +3,86 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 0..1, - }, + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 0..1, }, - ], - value: Attributed { - custom: (), - node: SetComp( - ExprSetComp { - elt: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 5..6, - }, - ), - }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 11..12, - }, - ), - }, - iter: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 17..18, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 20..21, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 23..24, - }, - ), - }, - ], - ctx: Load, - range: 16..25, - }, - ), - }, - ifs: [], - is_async: false, - range: 7..25, - }, - ], - range: 4..26, + ), + ], + value: SetComp( + ExprSetComp { + elt: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Load, + range: 5..6, }, ), + generators: [ + Comprehension { + target: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 11..12, + }, + ), + iter: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 17..18, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 20..21, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 23..24, + }, + ), + ], + ctx: Load, + range: 16..25, + }, + ), + ifs: [], + is_async: false, + range: PhantomData, + }, + ], + range: 4..26, }, - type_comment: None, - range: 0..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 862ce01..64ed94e 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap @@ -3,106 +3,79 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 1..2, - }, - ), - }, - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 5..6, - }, - ), - }, - ctx: Store, - range: 4..6, - }, - ), - }, - ], - ctx: Store, - range: 0..7, + Assign( + StmtAssign { + targets: [ + Tuple( + ExprTuple { + elts: [ + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 1..2, + }, + ), + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 5..6, + }, + ), + ctx: Store, + range: 4..6, + }, + ), + ], + ctx: Store, + range: 0..7, + }, + ), + ], + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 11..12, }, ), - }, - ], - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 11..12, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 14..15, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 17..18, - }, - ), - }, - ], - ctx: Load, - range: 10..19, - }, - ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 14..15, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 17..18, + }, + ), + ], + ctx: Load, + range: 10..19, }, - type_comment: None, - range: 0..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 8fb1861..22c321a 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap @@ -3,95 +3,71 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 0..1, - }, - ), - }, - slice: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 2..3, - }, - ), - }, - ctx: Store, - range: 0..4, + Assign( + StmtAssign { + targets: [ + Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 0..1, }, ), + slice: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Load, + range: 2..3, + }, + ), + ctx: Store, + range: 0..4, }, - ], - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 8..9, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 11..12, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 14..15, - }, - ), - }, - ], - ctx: Load, - range: 7..16, - }, - ), + ), + ], + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 8..9, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 11..12, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 14..15, + }, + ), + ], + ctx: Load, + range: 7..16, }, - type_comment: None, - range: 0..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 cfdf769..7974668 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap @@ -3,97 +3,73 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 1..2, - }, - ), - }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 4..5, - }, - ), - }, - ], - ctx: Store, - range: 0..6, + Assign( + StmtAssign { + targets: [ + Tuple( + ExprTuple { + elts: [ + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 1..2, + }, + ), + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 4..5, + }, + ), + ], + ctx: Store, + range: 0..6, + }, + ), + ], + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 10..11, }, ), - }, - ], - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 10..11, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 13..14, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 16..17, - }, - ), - }, - ], - ctx: Load, - range: 9..18, - }, - ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 13..14, + }, + ), + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 16..17, + }, + ), + ], + ctx: Load, + range: 9..18, }, - type_comment: None, - range: 0..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 c0dc7b7..78e7b4b 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap @@ -3,54 +3,42 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 5..6, - }, + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 1, ), + kind: None, + range: 5..6, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 10..11, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 10..11, }, ), - range: 5..11, + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 13..17, }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 13..17, - }, - ), - }, - ], - type_comment: None, - range: 0..17, - }, - ), - }, + ), + ], + 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 4097003..c416da0 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 @@ -3,84 +3,63 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: AugAssign( - StmtAugAssign { - target: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 0..1, - }, - ), - }, - attr: Identifier( - "y", + AugAssign( + StmtAugAssign { + target: Attribute( + ExprAttribute { + value: Name( + ExprName { + id: Identifier( + "x", ), - ctx: Store, - range: 0..3, - }, - ), - }, - op: Add, - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 8..9, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 11..12, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 14..15, - }, - ), - }, - ], ctx: Load, - range: 7..16, + range: 0..1, }, ), + attr: Identifier( + "y", + ), + ctx: Store, + range: 0..3, }, - range: 0..16, - }, - ), - }, + ), + op: Add, + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 8..9, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 11..12, + }, + ), + Constant( + ExprConstant { + 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 053377c..5731d2b 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 @@ -3,37 +3,28 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: AugAssign( - StmtAugAssign { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 0..1, - }, + AugAssign( + StmtAugAssign { + target: Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 0..1, }, - op: Add, - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 5..6, - }, + ), + op: Add, + value: Constant( + ExprConstant { + value: Int( + 1, ), + kind: None, + range: 5..6, }, - range: 0..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 ea0d6ca..8a8b86d 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 @@ -3,93 +3,69 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: AugAssign( - StmtAugAssign { - target: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 0..1, - }, - ), - }, - slice: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 2..3, - }, - ), - }, - ctx: Store, - range: 0..4, - }, - ), - }, - op: Add, - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 9..10, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 12..13, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 15..16, - }, - ), - }, - ], + AugAssign( + StmtAugAssign { + target: Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "x", + ), ctx: Load, - range: 8..17, + range: 0..1, }, ), + slice: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Load, + range: 2..3, + }, + ), + ctx: Store, + range: 0..4, }, - range: 0..17, - }, - ), - }, + ), + op: Add, + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 9..10, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 12..13, + }, + ), + Constant( + ExprConstant { + 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 9f0e9f3..8709f06 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap @@ -3,38 +3,29 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Delete( - StmtDelete { - targets: [ - Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 4..5, - }, - ), - }, - attr: Identifier( - "y", + Delete( + StmtDelete { + targets: [ + Attribute( + ExprAttribute { + value: Name( + ExprName { + id: Identifier( + "x", ), - ctx: Del, - range: 4..7, + ctx: Load, + range: 4..5, }, ), + attr: Identifier( + "y", + ), + ctx: Del, + range: 4..7, }, - ], - range: 0..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 3929a1d..6c8301a 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__del_name.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__del_name.snap @@ -3,26 +3,20 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Delete( - StmtDelete { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Del, - range: 4..5, - }, + Delete( + StmtDelete { + targets: [ + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Del, + range: 4..5, }, - ], - range: 0..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 e9f0c0f..359bfbe 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap @@ -3,47 +3,35 @@ source: parser/src/context.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Delete( - StmtDelete { - targets: [ - Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 4..5, - }, - ), - }, - slice: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 6..7, - }, - ), - }, - ctx: Del, - range: 4..8, + Delete( + StmtDelete { + targets: [ + Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 4..5, }, ), + slice: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Load, + range: 6..7, + }, + ), + ctx: Del, + range: 4..8, }, - ], - range: 0..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 0ef9667..25f8737 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 @@ -4,73 +4,58 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [], - vararg: None, - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 9..10, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 12..13, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 15..16, - }, - }, - ], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 6..16, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 19..23, - }, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [], + vararg: None, + kwonlyargs: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 9..10, + }, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 12..13, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 15..16, }, ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..23, + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 19..23, + }, + ), + ], + 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 dcb839e..3f9ce87 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 @@ -4,98 +4,77 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [], - vararg: None, - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 9..10, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 12..13, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 18..19, - }, - }, - ], - kw_defaults: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 20, - ), - kind: None, - range: 14..16, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 30, - ), - kind: None, - range: 20..22, - }, - ), - }, - ], - kwarg: None, - defaults: [], - range: 6..22, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 25..29, - }, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [], + vararg: None, + kwonlyargs: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 9..10, + }, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 12..13, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 18..19, }, ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..29, + kw_defaults: [ + Constant( + ExprConstant { + value: Int( + 20, + ), + kind: None, + range: 14..16, + }, + ), + Constant( + ExprConstant { + value: Int( + 30, + ), + kind: None, + range: 20..22, + }, + ), + ], + kwarg: None, + defaults: [], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 25..29, + }, + ), + ], + 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 c60daa4..4a412fa 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 @@ -4,39 +4,33 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 5..7, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 9..13, - }, - ), - }, - ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..13, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [], + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 9..13, + }, + ), + ], + 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 8549091..64a30cf 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 @@ -4,107 +4,83 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 6..7, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 9..10, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 12..13, - }, - }, - ], - vararg: None, - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "d", - ), - annotation: None, - type_comment: None, - range: 18..19, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "e", - ), - annotation: None, - type_comment: None, - range: 21..22, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "f", - ), - annotation: None, - type_comment: None, - range: 24..25, - }, - }, - ], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 6..25, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 28..32, - }, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 6..7, + }, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 9..10, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 12..13, }, ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..32, + vararg: None, + kwonlyargs: [ + Arg { + arg: Identifier( + "d", + ), + annotation: None, + type_comment: None, + range: 18..19, + }, + Arg { + arg: Identifier( + "e", + ), + annotation: None, + type_comment: None, + range: 21..22, + }, + Arg { + arg: Identifier( + "f", + ), + annotation: None, + type_comment: None, + range: 24..25, + }, + ], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 28..32, + }, + ), + ], + 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 02ca59c..9e0d188 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 @@ -4,132 +4,102 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 6..7, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 9..10, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 12..13, - }, - }, - ], - vararg: None, - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "d", - ), - annotation: None, - type_comment: None, - range: 18..19, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "e", - ), - annotation: None, - type_comment: None, - range: 21..22, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "f", - ), - annotation: None, - type_comment: None, - range: 27..28, - }, - }, - ], - kw_defaults: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 20, - ), - kind: None, - range: 23..25, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 30, - ), - kind: None, - range: 29..31, - }, - ), - }, - ], - kwarg: None, - defaults: [], - range: 6..31, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 34..38, - }, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 6..7, + }, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 9..10, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 12..13, }, ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..38, + vararg: None, + kwonlyargs: [ + Arg { + arg: Identifier( + "d", + ), + annotation: None, + type_comment: None, + range: 18..19, + }, + Arg { + arg: Identifier( + "e", + ), + annotation: None, + type_comment: None, + range: 21..22, + }, + Arg { + arg: Identifier( + "f", + ), + annotation: None, + type_comment: None, + range: 27..28, + }, + ], + kw_defaults: [ + Constant( + ExprConstant { + value: Int( + 20, + ), + kind: None, + range: 23..25, + }, + ), + Constant( + ExprConstant { + value: Int( + 30, + ), + kind: None, + range: 29..31, + }, + ), + ], + kwarg: None, + defaults: [], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 34..38, + }, + ), + ], + 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 d5cd799..7694156 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 @@ -4,144 +4,111 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 6..7, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 9..10, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 12..13, - }, - }, - ], - vararg: Some( - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "args", - ), - annotation: None, - type_comment: None, - range: 16..20, - }, - }, - ), - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "d", - ), - annotation: None, - type_comment: None, - range: 22..23, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "e", - ), - annotation: None, - type_comment: None, - range: 25..26, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "f", - ), - annotation: None, - type_comment: None, - range: 31..32, - }, - }, - ], - kw_defaults: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 20, - ), - kind: None, - range: 27..29, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 30, - ), - kind: None, - range: 33..35, - }, - ), - }, - ], - kwarg: None, - defaults: [], - range: 6..35, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 38..42, - }, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 6..7, + }, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 9..10, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 12..13, }, ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..42, + vararg: Some( + Arg { + arg: Identifier( + "args", + ), + annotation: None, + type_comment: None, + range: 16..20, + }, + ), + kwonlyargs: [ + Arg { + arg: Identifier( + "d", + ), + annotation: None, + type_comment: None, + range: 22..23, + }, + Arg { + arg: Identifier( + "e", + ), + annotation: None, + type_comment: None, + range: 25..26, + }, + Arg { + arg: Identifier( + "f", + ), + annotation: None, + type_comment: None, + range: 31..32, + }, + ], + kw_defaults: [ + Constant( + ExprConstant { + value: Int( + 20, + ), + kind: None, + range: 27..29, + }, + ), + Constant( + ExprConstant { + value: Int( + 30, + ), + kind: None, + range: 33..35, + }, + ), + ], + kwarg: None, + defaults: [], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 38..42, + }, + ), + ], + 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 cda7281..27963dc 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 @@ -4,156 +4,120 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 6..7, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 9..10, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 12..13, - }, - }, - ], - vararg: Some( - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "args", - ), - annotation: None, - type_comment: None, - range: 16..20, - }, - }, - ), - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "d", - ), - annotation: None, - type_comment: None, - range: 22..23, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "e", - ), - annotation: None, - type_comment: None, - range: 25..26, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "f", - ), - annotation: None, - type_comment: None, - range: 31..32, - }, - }, - ], - kw_defaults: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 20, - ), - kind: None, - range: 27..29, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 30, - ), - kind: None, - range: 33..35, - }, - ), - }, - ], - kwarg: Some( - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "kwargs", - ), - annotation: None, - type_comment: None, - range: 39..45, - }, - }, - ), - defaults: [], - range: 6..45, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 48..52, - }, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 6..7, + }, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 9..10, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 12..13, }, ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..52, + vararg: Some( + Arg { + arg: Identifier( + "args", + ), + annotation: None, + type_comment: None, + range: 16..20, + }, + ), + kwonlyargs: [ + Arg { + arg: Identifier( + "d", + ), + annotation: None, + type_comment: None, + range: 22..23, + }, + Arg { + arg: Identifier( + "e", + ), + annotation: None, + type_comment: None, + range: 25..26, + }, + Arg { + arg: Identifier( + "f", + ), + annotation: None, + type_comment: None, + range: 31..32, + }, + ], + kw_defaults: [ + Constant( + ExprConstant { + value: Int( + 20, + ), + kind: None, + range: 27..29, + }, + ), + Constant( + ExprConstant { + value: Int( + 30, + ), + kind: None, + range: 33..35, + }, + ), + ], + kwarg: Some( + Arg { + arg: Identifier( + "kwargs", + ), + annotation: None, + type_comment: None, + range: 39..45, + }, + ), + defaults: [], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 48..52, + }, + ), + ], + 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 45a1289..b376895 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 @@ -4,73 +4,58 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 6..7, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 9..10, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 12..13, - }, - }, - ], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 6..13, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 16..20, - }, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 6..7, + }, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 9..10, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 12..13, }, ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..20, + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 16..20, + }, + ), + ], + 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 43ddda7..9cd5d29 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 @@ -4,98 +4,77 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "f", - ), - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 6..7, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 9..10, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 15..16, - }, - }, - ], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 20, - ), - kind: None, - range: 11..13, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 30, - ), - kind: None, - range: 17..19, - }, - ), - }, - ], - range: 6..19, - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 22..26, - }, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "f", + ), + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 6..7, + }, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 9..10, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 15..16, }, ], - decorator_list: [], - returns: None, - type_comment: None, - range: 0..26, + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [ + Constant( + ExprConstant { + value: Int( + 20, + ), + kind: None, + range: 11..13, + }, + ), + Constant( + ExprConstant { + value: Int( + 30, + ), + kind: None, + range: 17..19, + }, + ), + ], + range: PhantomData, }, - ), - }, + body: [ + Pass( + StmtPass { + range: 22..26, + }, + ), + ], + 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 02230ce..67e8716 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 @@ -4,77 +4,59 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Lambda( - ExprLambda { - args: Arguments { - posonlyargs: [], - args: [], - vararg: None, - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 10..11, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 13..14, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 16..17, - }, - }, - ], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 7..17, - }, - body: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 19..20, - }, + Expr( + StmtExpr { + value: Lambda( + ExprLambda { + args: Arguments { + posonlyargs: [], + args: [], + vararg: None, + kwonlyargs: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 10..11, }, - range: 0..20, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 13..14, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 16..17, + }, + ], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 19..20, }, ), + range: 0..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 41f9a25..66f53b9 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 @@ -4,102 +4,78 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Lambda( - ExprLambda { - args: Arguments { - posonlyargs: [], - args: [], - vararg: None, - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 10..11, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 13..14, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 19..20, - }, - }, - ], - kw_defaults: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 20, - ), - kind: None, - range: 15..17, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 30, - ), - kind: None, - range: 21..23, - }, - ), - }, - ], - kwarg: None, - defaults: [], - range: 7..23, - }, - body: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 25..26, - }, + Expr( + StmtExpr { + value: Lambda( + ExprLambda { + args: Arguments { + posonlyargs: [], + args: [], + vararg: None, + kwonlyargs: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 10..11, }, - range: 0..26, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 13..14, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 19..20, + }, + ], + kw_defaults: [ + Constant( + ExprConstant { + value: Int( + 20, + ), + kind: None, + range: 15..17, + }, + ), + Constant( + ExprConstant { + value: Int( + 30, + ), + kind: None, + range: 21..23, + }, + ), + ], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 25..26, }, ), + range: 0..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 4d25dcc..97805c1 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 @@ -4,43 +4,34 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Lambda( - ExprLambda { - args: Arguments { - posonlyargs: [], - args: [], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 0..9, - }, - body: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 8..9, - }, - ), - }, - range: 0..9, + Expr( + StmtExpr { + value: Lambda( + ExprLambda { + args: Arguments { + posonlyargs: [], + args: [], + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 8..9, }, ), + range: 0..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 5d5cd59..ea86ee8 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 @@ -4,100 +4,76 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Lambda( - ExprLambda { - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 7..8, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 10..11, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 13..14, - }, - }, - ], - vararg: None, - kwonlyargs: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "d", - ), - annotation: None, - type_comment: None, - range: 19..20, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "e", - ), - annotation: None, - type_comment: None, - range: 22..23, - }, - }, - ], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 7..23, - }, - body: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 25..26, - }, + Expr( + StmtExpr { + value: Lambda( + ExprLambda { + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 7..8, }, - range: 0..26, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 10..11, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 13..14, + }, + ], + vararg: None, + kwonlyargs: [ + Arg { + arg: Identifier( + "d", + ), + annotation: None, + type_comment: None, + range: 19..20, + }, + Arg { + arg: Identifier( + "e", + ), + annotation: None, + type_comment: None, + range: 22..23, + }, + ], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 25..26, }, ), + range: 0..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 c7f6691..4cd5767 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 @@ -4,77 +4,59 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Lambda( - ExprLambda { - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 7..8, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 10..11, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 13..14, - }, - }, - ], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 7..14, - }, - body: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 16..17, - }, + Expr( + StmtExpr { + value: Lambda( + ExprLambda { + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 7..8, }, - range: 0..17, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 10..11, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 13..14, + }, + ], + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 16..17, }, ), + range: 0..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 bce4e36..db51987 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 @@ -4,102 +4,78 @@ expression: parse_ast --- Ok( [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Lambda( - ExprLambda { - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, - range: 7..8, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, - range: 10..11, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, - range: 16..17, - }, - }, - ], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 20, - ), - kind: None, - range: 12..14, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 30, - ), - kind: None, - range: 18..20, - }, - ), - }, - ], - range: 7..20, - }, - body: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 22..23, - }, + Expr( + StmtExpr { + value: Lambda( + ExprLambda { + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "a", ), + annotation: None, + type_comment: None, + range: 7..8, }, - range: 0..23, + Arg { + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + range: 10..11, + }, + Arg { + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + range: 16..17, + }, + ], + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [ + Constant( + ExprConstant { + value: Int( + 20, + ), + kind: None, + range: 12..14, + }, + ), + Constant( + ExprConstant { + value: Int( + 30, + ), + kind: None, + range: 18..20, + }, + ), + ], + range: PhantomData, + }, + body: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 22..23, }, ), + range: 0..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 47144fa..f124217 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__dict_unpacking.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__dict_unpacking.snap @@ -2,80 +2,62 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: Dict( - ExprDict { - keys: [ - Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "a", - ), - kind: None, - range: 1..4, - }, +Dict( + ExprDict { + keys: [ + Some( + Constant( + ExprConstant { + value: Str( + "a", ), + kind: None, + range: 1..4, }, ), - None, - Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "d", - ), - kind: None, - range: 16..19, - }, + ), + None, + Some( + Constant( + ExprConstant { + value: Str( + "d", ), + kind: None, + range: 16..19, }, ), - ], - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "b", - ), - kind: None, - range: 6..9, - }, + ), + ], + values: [ + Constant( + ExprConstant { + value: Str( + "b", ), + kind: None, + range: 6..9, }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "c", - ), - ctx: Load, - range: 13..14, - }, + ), + Name( + ExprName { + id: Identifier( + "c", ), + ctx: Load, + range: 13..14, }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "e", - ), - kind: None, - range: 21..24, - }, + ), + Constant( + ExprConstant { + value: Str( + "e", ), + kind: None, + range: 21..24, }, - ], - range: 0..25, - }, - ), -} + ), + ], + 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 96012fd..275d116 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 @@ -2,214 +2,157 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - " ", - ), - kind: None, - range: 0..3, - }, - ), - }, - attr: Identifier( - "join", +Call( + ExprCall { + func: Attribute( + ExprAttribute { + value: Constant( + ExprConstant { + value: Str( + " ", ), - ctx: Load, - range: 0..8, + kind: None, + range: 0..3, }, ), + attr: Identifier( + "join", + ), + ctx: Load, + range: 0..8, }, - args: [ - Attributed { - custom: (), - node: GeneratorExp( - ExprGeneratorExp { - elt: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "sql", - ), - ctx: Load, - range: 14..17, - }, - ), - }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "sql", - ), - ctx: Store, - range: 26..29, - }, - ), - }, - iter: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: IfExp( - ExprIfExp { - test: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "limit", - ), - ctx: Load, - range: 65..70, - }, - ), - }, - body: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "LIMIT %d", - ), - kind: None, - range: 43..53, - }, - ), - }, - op: Mod, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "limit", - ), - ctx: Load, - range: 56..61, - }, - ), - }, - range: 43..61, - }, - ), - }, - orelse: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: None, - kind: None, - range: 76..80, - }, - ), - }, - range: 43..80, - }, - ), - }, - Attributed { - custom: (), - node: IfExp( - ExprIfExp { - test: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "offset", - ), - ctx: Load, - range: 116..122, - }, - ), - }, - body: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "OFFSET %d", - ), - kind: None, - range: 91..102, - }, - ), - }, - op: Mod, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "offset", - ), - ctx: Load, - range: 105..111, - }, - ), - }, - range: 91..111, - }, - ), - }, - orelse: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: None, - kind: None, - range: 128..132, - }, - ), - }, - range: 90..132, - }, - ), - }, - ], - ctx: Load, - range: 33..139, - }, - ), - }, - ifs: [], - is_async: false, - range: 22..139, - }, - ], - range: 14..139, + ), + args: [ + GeneratorExp( + ExprGeneratorExp { + elt: Name( + ExprName { + id: Identifier( + "sql", + ), + ctx: Load, + range: 14..17, }, ), + generators: [ + Comprehension { + target: Name( + ExprName { + id: Identifier( + "sql", + ), + ctx: Store, + range: 26..29, + }, + ), + iter: Tuple( + ExprTuple { + elts: [ + IfExp( + ExprIfExp { + test: Name( + ExprName { + id: Identifier( + "limit", + ), + ctx: Load, + range: 65..70, + }, + ), + body: BinOp( + ExprBinOp { + left: Constant( + ExprConstant { + value: Str( + "LIMIT %d", + ), + kind: None, + range: 43..53, + }, + ), + op: Mod, + right: Name( + ExprName { + id: Identifier( + "limit", + ), + ctx: Load, + range: 56..61, + }, + ), + range: 43..61, + }, + ), + orelse: Constant( + ExprConstant { + value: None, + kind: None, + range: 76..80, + }, + ), + range: 43..80, + }, + ), + IfExp( + ExprIfExp { + test: Name( + ExprName { + id: Identifier( + "offset", + ), + ctx: Load, + range: 116..122, + }, + ), + body: BinOp( + ExprBinOp { + left: Constant( + ExprConstant { + value: Str( + "OFFSET %d", + ), + kind: None, + range: 91..102, + }, + ), + op: Mod, + right: Name( + ExprName { + id: Identifier( + "offset", + ), + ctx: Load, + range: 105..111, + }, + ), + range: 91..111, + }, + ), + orelse: Constant( + ExprConstant { + value: None, + kind: None, + range: 128..132, + }, + ), + range: 90..132, + }, + ), + ], + ctx: Load, + range: 33..139, + }, + ), + ifs: [], + is_async: false, + range: PhantomData, + }, + ], + range: 14..139, }, - ], - keywords: [], - range: 0..141, - }, - ), -} + ), + ], + 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 27cd4d0..2764a57 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__match.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__match.snap @@ -3,614 +3,458 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Dict( - ExprDict { - keys: [ - Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "test", - ), - kind: None, - range: 8..14, - }, - ), - }, - ), - ], - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 16..17, - }, + Match( + StmtMatch { + subject: Dict( + ExprDict { + keys: [ + Some( + Constant( + ExprConstant { + value: Str( + "test", ), - }, - ], - range: 7..18, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: Some( - Identifier( - "rest", - ), - ), - range: 29..52, + kind: None, + range: 8..14, }, ), + ), + ], + values: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 16..17, + }, + ), + ], + range: 7..18, + }, + ), + cases: [ + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: Some( + Identifier( + "rest", + ), + ), + range: 29..52, }, - guard: None, - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "print", - ), - ctx: Load, - range: 62..67, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "rest", - ), - ctx: Load, - range: 68..72, - }, - ), - }, - ], - keywords: [], - range: 62..73, + ), + guard: None, + body: [ + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 62..67, + }, + ), + args: [ + Name( + ExprName { + id: Identifier( + "rest", + ), + ctx: Load, + range: 68..72, }, ), - }, + ], + keywords: [], range: 62..73, }, ), + range: 62..73, }, - ], - range: 24..74, - }, - ], - range: 1..73, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Dict( - ExprDict { + ), + ], + range: PhantomData, + }, + ], + range: 1..73, + }, + ), + Match( + StmtMatch { + subject: Dict( + ExprDict { + keys: [ + Some( + Constant( + ExprConstant { + value: Str( + "label", + ), + kind: None, + range: 81..88, + }, + ), + ), + ], + values: [ + Constant( + ExprConstant { + value: Str( + "test", + ), + kind: None, + range: 90..96, + }, + ), + ], + range: 80..97, + }, + ), + cases: [ + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { keys: [ - Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "label", - ), - kind: None, - range: 81..88, - }, + Constant( + ExprConstant { + value: Str( + "label", ), + kind: None, + range: 118..125, }, ), ], - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "test", - ), - kind: None, - range: 90..96, - }, - ), - }, - ], - range: 80..97, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "label", - ), - kind: None, - range: 118..125, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: Some( - Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchClass( - PatternMatchClass { - cls: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "str", - ), - ctx: Load, - range: 127..130, - }, - ), - }, - patterns: [], - kwd_attrs: [], - kwd_patterns: [], - range: 127..132, - }, - ), - }, - Attributed { - custom: (), - node: MatchSingleton( - PatternMatchSingleton { - value: None, - range: 135..139, - }, - ), - }, - ], - range: 127..139, - }, - ), - }, - ), - name: Some( - Identifier( - "label", - ), - ), - range: 127..148, - }, - ), - }, - ], - rest: None, - range: 108..155, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "print", + patterns: [ + MatchAs( + PatternMatchAs { + pattern: Some( + MatchOr( + PatternMatchOr { + patterns: [ + MatchClass( + PatternMatchClass { + cls: Name( + ExprName { + id: Identifier( + "str", + ), + ctx: Load, + range: 127..130, + }, ), - ctx: Load, - range: 165..170, + patterns: [], + kwd_attrs: [], + kwd_patterns: [], + range: 127..132, + }, + ), + MatchSingleton( + PatternMatchSingleton { + value: None, + range: 135..139, }, ), - }, - args: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "label", - ), - ctx: Load, - range: 171..176, - }, - ), - }, ], - keywords: [], - range: 165..177, + range: 127..139, }, ), - }, + ), + name: Some( + Identifier( + "label", + ), + ), + range: 127..148, + }, + ), + ], + rest: None, + range: 108..155, + }, + ), + guard: None, + body: [ + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 165..170, + }, + ), + args: [ + Name( + ExprName { + id: Identifier( + "label", + ), + ctx: Load, + range: 171..176, + }, + ), + ], + keywords: [], range: 165..177, }, ), + range: 165..177, }, - ], - range: 103..178, - }, - ], - range: 74..177, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 184..185, - }, - ), + ), + ], + range: PhantomData, }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 197..198, - }, - ), - }, - range: 197..198, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 200..201, - }, - ), - }, - range: 200..201, - }, - ), - }, - ], - range: 196..203, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 213..214, - }, + ], + 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, }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 217..218, - }, - ), - }, - type_comment: None, - range: 213..218, + ), + range: 197..198, }, ), - }, - ], - range: 191..219, - }, - ], - range: 178..218, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 225..226, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 238..239, - }, - ), - }, - range: 238..239, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 241..242, - }, - ), - }, - range: 241..242, - }, - ), - }, - ], - range: 237..244, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 254..255, - }, + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, ), + kind: None, + range: 200..201, }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 258..259, - }, - ), - }, - type_comment: None, - range: 254..259, + ), + range: 200..201, }, ), - }, - ], - range: 232..260, - }, - ], - range: 219..259, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 266..267, + ], + range: 196..203, }, ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 279..280, - }, - ), - }, - range: 279..280, - }, + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", ), + ctx: Store, + range: 213..214, }, - ], - range: 278..282, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 292..293, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 296..297, - }, - ), - }, - type_comment: None, - range: 292..297, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 217..218, }, ), + type_comment: None, + range: 213..218, }, - ], - range: 273..298, - }, - ], - range: 260..297, - }, - ), - }, + ), + ], + range: PhantomData, + }, + ], + range: 178..218, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 225..226, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 238..239, + }, + ), + range: 238..239, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 241..242, + }, + ), + range: 241..242, + }, + ), + ], + range: 237..244, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 254..255, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 258..259, + }, + ), + type_comment: None, + range: 254..259, + }, + ), + ], + range: PhantomData, + }, + ], + range: 219..259, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 266..267, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 279..280, + }, + ), + range: 279..280, + }, + ), + ], + range: 278..282, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 292..293, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 296..297, + }, + ), + type_comment: None, + range: 292..297, + }, + ), + ], + range: PhantomData, + }, + ], + range: 260..297, + }, + ), ] 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 230fd5b..18de1b6 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 @@ -3,1221 +3,882 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 1..6, - }, - ), - }, - op: Mult, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 8..9, - }, - ), - }, - range: 1..9, - }, - ), - }, - op: Add, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 12..13, - }, - ), - }, - range: 1..13, - }, - ), - }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "c", - ), - ctx: Load, - range: 15..16, - }, - ), - }, - ], - ctx: Load, - range: 1..16, - }, - ), - }, - range: 1..16, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 42..47, - }, - ), - }, - op: Mult, - right: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 50..51, - }, - ), - }, - op: Add, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 54..55, - }, - ), - }, - range: 50..55, - }, - ), - }, - range: 42..56, - }, - ), - }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "c", - ), - ctx: Load, - range: 58..59, - }, - ), - }, - ], - ctx: Load, - range: 42..59, - }, - ), - }, - range: 42..59, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 85..90, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 93..94, - }, - ), - }, - op: Add, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 97..98, - }, - ), - }, - range: 93..98, - }, - ), - }, - ctx: Load, - range: 92..98, - }, - ), - }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "c", - ), - ctx: Load, - range: 100..101, - }, - ), - }, - ], - keywords: [], - range: 85..102, - }, - ), - }, - range: 85..102, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: BinOp( + Expr( + StmtExpr { + value: Tuple( + ExprTuple { + elts: [ + BinOp( + ExprBinOp { + left: BinOp( ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 129..134, - }, - ), - }, - op: Sub, - right: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 136..137, - }, - ), - }, - op: Mult, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 140..141, - }, - ), - }, - range: 136..141, - }, - ), - }, - range: 129..141, - }, - ), - }, - op: Add, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "c", + left: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 1..6, + }, ), - ctx: Load, - range: 144..145, - }, - ), - }, - range: 129..145, - }, - ), - }, - range: 129..145, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 172..177, - }, - ), - }, - op: Sub, - right: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 180..181, - }, - ), - }, - op: Mult, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 184..185, - }, - ), - }, - range: 180..185, - }, - ), - }, - range: 172..186, - }, - ), - }, - op: Add, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "c", - ), - ctx: Load, - range: 189..190, - }, - ), - }, - range: 172..190, - }, - ), - }, - range: 172..190, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 217..222, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: UnaryOp( - ExprUnaryOp { - op: USub, - operand: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 225..226, - }, - ), - }, - range: 224..226, - }, - ), - }, - ], - keywords: [], - range: 217..227, - }, - ), - }, op: Mult, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 230..231, - }, - ), - }, - range: 217..231, + right: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 8..9, + }, + ), + range: 1..9, }, ), - }, - op: Add, - right: Attributed { - custom: (), - node: Name( + op: Add, + right: Name( ExprName { id: Identifier( - "c", + "b", ), ctx: Load, - range: 234..235, + range: 12..13, }, ), - }, - range: 217..235, - }, - ), - }, - range: 217..235, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 263..268, - }, - ), - }, - args: [], - keywords: [], - range: 263..271, - }, - ), - }, - attr: Identifier( - "a", - ), - ctx: Load, - range: 263..273, - }, - ), - }, - range: 263..273, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 290..295, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [], - ctx: Load, - range: 297..299, - }, - ), - }, - ], - keywords: [], - range: 290..300, - }, - ), - }, - attr: Identifier( - "a", - ), - ctx: Load, - range: 290..302, - }, - ), - }, - range: 290..302, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 321..326, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [], - ctx: Load, - range: 328..330, - }, - ), - }, - ], - keywords: [], - range: 321..332, - }, - ), - }, - attr: Identifier( - "a", - ), - ctx: Load, - range: 321..334, - }, - ), - }, - range: 321..334, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 353..358, - }, - ), - }, - slice: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 360..361, - }, - ), - }, - ctx: Load, - range: 353..362, - }, - ), - }, - attr: Identifier( - "b", - ), - ctx: Load, - range: 353..364, - }, - ), - }, - range: 353..364, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 382..387, - }, - ), - }, - slice: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: 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, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 435..440, - }, - ), - }, - slice: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Name( - ExprName { - 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, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 470..475, - }, - ), - }, - args: [], - keywords: [], - range: 470..477, - }, - ), - }, - slice: Attributed { - custom: (), - node: Slice( - ExprSlice { - lower: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 478..479, - }, - ), - }, - ), - upper: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 485..486, - }, - ), - }, - ), - step: None, - range: 478..486, - }, - ), - }, - ctx: Load, - range: 470..487, - }, - ), - }, - range: 470..487, - }, - ), - }, - Attributed { - custom: (), - node: If( - StmtIf { - test: Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Store, - range: 510..515, - }, - ), - }, - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 519..520, - }, - ), - }, - range: 510..520, - }, - ), - }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 522..526, + range: 1..13, }, ), - }, - ], - orelse: [], - range: 507..526, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( + Name( + ExprName { + id: Identifier( + "c", + ), + ctx: Load, + range: 15..16, + }, + ), + ], + ctx: Load, + range: 1..16, + }, + ), + range: 1..16, + }, + ), + Expr( + StmtExpr { + value: Tuple( + ExprTuple { + elts: [ + BinOp( + ExprBinOp { + left: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 42..47, + }, + ), + op: Mult, + right: BinOp( + ExprBinOp { + left: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 50..51, + }, + ), + op: Add, + right: Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Load, + range: 54..55, + }, + ), + range: 50..55, + }, + ), + range: 42..56, + }, + ), + Name( + ExprName { + id: Identifier( + "c", + ), + ctx: Load, + range: 58..59, + }, + ), + ], + ctx: Load, + range: 42..59, + }, + ), + range: 42..59, + }, + ), + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( ExprName { id: Identifier( "match", ), ctx: Load, - range: 533..538, + range: 85..90, }, ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, + args: [ + Starred( + ExprStarred { + value: BinOp( + ExprBinOp { + left: Name( + ExprName { + id: Identifier( + "a", ), - kind: None, - range: 549..550, + ctx: Load, + range: 93..94, }, ), + op: Add, + right: Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Load, + range: 97..98, + }, + ), + range: 93..98, }, + ), + ctx: Load, + range: 92..98, + }, + ), + Name( + ExprName { + 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 { + left: BinOp( + ExprBinOp { + left: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 172..177, + }, + ), + op: Sub, + right: BinOp( + ExprBinOp { + left: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 180..181, + }, + ), + op: Mult, + right: Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Load, + range: 184..185, + }, + ), + range: 180..185, + }, + ), + range: 172..186, + }, + ), + op: Add, + right: Name( + ExprName { + id: Identifier( + "c", + ), + ctx: Load, + range: 189..190, + }, + ), + range: 172..190, + }, + ), + range: 172..190, + }, + ), + Expr( + StmtExpr { + value: BinOp( + ExprBinOp { + left: BinOp( + ExprBinOp { + left: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 217..222, + }, + ), + args: [ + UnaryOp( + ExprUnaryOp { + op: USub, + operand: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 225..226, + }, + ), + range: 224..226, + }, + ), + ], + keywords: [], + range: 217..227, + }, + ), + op: Mult, + right: Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Load, + range: 230..231, + }, + ), + range: 217..231, + }, + ), + op: Add, + right: Name( + ExprName { + id: Identifier( + "c", + ), + ctx: Load, + range: 234..235, + }, + ), + range: 217..235, + }, + ), + range: 217..235, + }, + ), + Expr( + StmtExpr { + value: Attribute( + ExprAttribute { + value: Call( + ExprCall { + func: Name( + ExprName { + 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 { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 321..326, + }, + ), + args: [ + Tuple( + ExprTuple { + elts: [], + ctx: Load, + range: 328..330, + }, + ), + ], + keywords: [], + range: 321..332, + }, + ), + attr: Identifier( + "a", + ), + ctx: Load, + range: 321..334, + }, + ), + range: 321..334, + }, + ), + Expr( + StmtExpr { + value: Attribute( + ExprAttribute { + value: Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 353..358, + }, + ), + slice: Name( + ExprName { + 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 { + value: Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 435..440, + }, + ), + slice: Tuple( + ExprTuple { + elts: [ + Name( + ExprName { + 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 { + value: Subscript( + ExprSubscript { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 470..475, + }, + ), + args: [], + keywords: [], + range: 470..477, + }, + ), + slice: Slice( + ExprSlice { + lower: Some( + Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 478..479, + }, + ), + ), + upper: Some( + Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Load, + range: 485..486, + }, + ), + ), + step: None, + range: 478..486, + }, + ), + ctx: Load, + range: 470..487, + }, + ), + range: 470..487, + }, + ), + If( + StmtIf { + test: NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Store, + range: 510..515, + }, + ), + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 519..520, + }, + ), + range: 510..520, + }, + ), + body: [ + Pass( + StmtPass { + range: 522..526, + }, + ), + ], + orelse: [], + range: 507..526, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 533..538, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, range: 549..550, }, ), + range: 549..550, }, - guard: None, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 552..556, - }, - ), + ), + guard: None, + body: [ + Pass( + StmtPass { + range: 552..556, }, - ], - range: 544..557, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 566..567, - }, - ), - }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, range: 566..567, }, ), + range: 566..567, }, - guard: None, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 577..581, - }, - ), - }, - ], - range: 561..582, - }, - ], - range: 527..581, - }, - ), - }, - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Store, - range: 582..587, + ), + guard: None, + body: [ + Pass( + StmtPass { + range: 577..581, }, ), + ], + range: PhantomData, + }, + ], + range: 527..581, + }, + ), + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Store, + range: 582..587, }, - ], - value: Attributed { - custom: (), - node: Lambda( - ExprLambda { - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "query", - ), - annotation: None, - type_comment: None, - range: 597..602, - }, - }, - ], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [], + ), + ], + value: Lambda( + ExprLambda { + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "query", + ), + annotation: None, + type_comment: None, range: 597..602, }, - body: Attributed { - custom: (), - node: Compare( - ExprCompare { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "query", - ), - ctx: Load, - range: 604..609, - }, - ), - }, - ops: [ - Eq, - ], - comparators: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "event", - ), - ctx: Load, - range: 613..618, - }, - ), - }, - ], - range: 604..618, - }, - ), - }, - range: 590..618, - }, - ), - }, - type_comment: None, - range: 582..618, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( + ], + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: Compare( + ExprCompare { + left: Name( + ExprName { + id: Identifier( + "query", + ), + ctx: Load, + range: 604..609, + }, + ), + ops: [ + Eq, + ], + comparators: [ + Name( ExprName { id: Identifier( - "print", + "event", ), ctx: Load, - range: 619..624, + range: 613..618, }, ), - }, - args: [ - Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "match", - ), - ctx: Load, - range: 625..630, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 12, - ), - kind: None, - range: 631..633, - }, - ), - }, - ], - keywords: [], - range: 625..634, - }, - ), - }, ], - keywords: [], - range: 619..635, + range: 604..618, }, ), + range: 590..618, }, - range: 619..635, - }, - ), - }, + ), + type_comment: None, + range: 582..618, + }, + ), + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 619..624, + }, + ), + args: [ + Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "match", + ), + ctx: Load, + range: 625..630, + }, + ), + args: [ + Constant( + ExprConstant { + 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 2506260..353dff5 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 @@ -2,38 +2,29 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: BoolOp( - ExprBoolOp { - op: And, - values: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 0..1, - }, +BoolOp( + ExprBoolOp { + op: And, + values: [ + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Load, + range: 0..1, }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 6..7, - }, + ), + Name( + ExprName { + id: Identifier( + "y", ), + ctx: Load, + range: 6..7, }, - ], - range: 0..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 ddffaf2..fede6f1 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 @@ -2,38 +2,29 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: BoolOp( - ExprBoolOp { - op: Or, - values: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 0..1, - }, +BoolOp( + ExprBoolOp { + op: Or, + values: [ + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Load, + range: 0..1, }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 5..6, - }, + ), + Name( + ExprName { + id: Identifier( + "y", ), + ctx: Load, + range: 5..6, }, - ], - range: 0..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 b8495aa..434f32f 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap @@ -3,161 +3,128 @@ source: parser/src/parser.rs expression: "parse_program(source, \"\").unwrap()" --- [ - Attributed { - custom: (), - node: ClassDef( - StmtClassDef { - name: Identifier( - "Foo", + ClassDef( + StmtClassDef { + name: Identifier( + "Foo", + ), + bases: [ + Name( + ExprName { + id: Identifier( + "A", + ), + ctx: Load, + range: 10..11, + }, ), - bases: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "A", - ), - ctx: Load, - range: 10..11, - }, + Name( + ExprName { + id: Identifier( + "B", ), + ctx: Load, + range: 13..14, }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "B", - ), - ctx: Load, - range: 13..14, - }, + ), + ], + keywords: [], + body: [ + FunctionDef( + StmtFunctionDef { + name: Identifier( + "__init__", ), - }, - ], - keywords: [], - body: [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "__init__", - ), - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "self", - ), - annotation: None, - type_comment: None, - range: 31..35, - }, - }, - ], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [], + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "self", + ), + annotation: None, + type_comment: None, range: 31..35, }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 40..44, - }, - ), - }, - ], - decorator_list: [], - returns: None, - type_comment: None, - range: 18..44, - }, - ), - }, - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "method_with_default", - ), - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "self", - ), - annotation: None, - type_comment: None, - range: 70..74, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "arg", - ), - annotation: None, - type_comment: None, - range: 76..79, - }, - }, - ], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "default", - ), - kind: None, - range: 80..89, - }, - ), - }, - ], - range: 70..89, + ], + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: [ + Pass( + StmtPass { + range: 40..44, }, - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 94..98, - }, - ), - }, - ], - decorator_list: [], - returns: None, - type_comment: None, - range: 46..98, - }, - ), + ), + ], + decorator_list: [], + returns: None, + type_comment: None, + range: 18..44, }, - ], - decorator_list: [], - range: 0..98, - }, - ), - }, + ), + FunctionDef( + StmtFunctionDef { + name: Identifier( + "method_with_default", + ), + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "self", + ), + annotation: None, + type_comment: None, + range: 70..74, + }, + Arg { + arg: Identifier( + "arg", + ), + annotation: None, + type_comment: None, + range: 76..79, + }, + ], + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [ + Constant( + ExprConstant { + value: Str( + "default", + ), + kind: None, + range: 80..89, + }, + ), + ], + range: PhantomData, + }, + body: [ + Pass( + StmtPass { + range: 94..98, + }, + ), + ], + 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 1012f7b..4e16811 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 @@ -2,66 +2,51 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: DictComp( - ExprDictComp { - key: Attributed { - custom: (), - node: Name( +DictComp( + ExprDictComp { + key: Name( + ExprName { + id: Identifier( + "x1", + ), + ctx: Load, + range: 1..3, + }, + ), + value: Name( + ExprName { + id: Identifier( + "x2", + ), + ctx: Load, + range: 5..7, + }, + ), + generators: [ + Comprehension { + target: Name( ExprName { id: Identifier( - "x1", + "y", ), - ctx: Load, - range: 1..3, + ctx: Store, + range: 12..13, }, ), - }, - value: Attributed { - custom: (), - node: Name( + iter: Name( ExprName { id: Identifier( - "x2", + "z", ), ctx: Load, - range: 5..7, + range: 17..18, }, ), + ifs: [], + is_async: false, + range: PhantomData, }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 12..13, - }, - ), - }, - iter: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Load, - range: 17..18, - }, - ), - }, - ifs: [], - is_async: false, - range: 8..18, - }, - ], - range: 0..19, - }, - ), -} + ], + 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 e3753d7..c085b23 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 @@ -2,181 +2,139 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: ListComp( - ExprListComp { - elt: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1..2, +ListComp( + ExprListComp { + elt: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1..2, + }, + ), + generators: [ + Comprehension { + target: Tuple( + ExprTuple { + elts: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 7..8, + }, + ), + Name( + ExprName { + id: Identifier( + "y2", + ), + ctx: Store, + range: 10..12, + }, + ), + ], + ctx: Store, + range: 7..12, }, ), + iter: Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Load, + range: 16..17, + }, + ), + ifs: [], + is_async: false, + range: PhantomData, }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 7..8, - }, - ), - }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y2", - ), - ctx: Store, - range: 10..12, - }, - ), - }, - ], - ctx: Store, - range: 7..12, - }, + Comprehension { + target: Name( + ExprName { + id: Identifier( + "a", ), + ctx: Store, + range: 22..23, }, - iter: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Load, - range: 16..17, - }, + ), + iter: Name( + ExprName { + id: Identifier( + "b", ), + ctx: Load, + range: 27..28, }, - ifs: [], - is_async: false, - range: 3..17, - }, - Comprehension { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Store, - range: 22..23, - }, - ), - }, - iter: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 27..28, - }, - ), - }, - ifs: [ - Attributed { - custom: (), - node: Compare( - ExprCompare { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 32..33, - }, - ), - }, - ops: [ - Lt, - ], - comparators: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 5, - ), - kind: None, - range: 36..37, - }, - ), - }, - ], - range: 32..37, + ), + ifs: [ + Compare( + ExprCompare { + left: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 32..33, }, ), - }, - Attributed { - custom: (), - node: Compare( - ExprCompare { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 41..42, - }, + ops: [ + Lt, + ], + comparators: [ + Constant( + ExprConstant { + value: Int( + 5, ), + kind: None, + range: 36..37, }, - ops: [ - Gt, - ], - comparators: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 10, - ), - kind: None, - range: 45..47, - }, - ), - }, - ], - range: 41..47, + ), + ], + range: 32..37, + }, + ), + Compare( + ExprCompare { + left: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 41..42, }, ), + ops: [ + Gt, + ], + comparators: [ + Constant( + ExprConstant { + value: Int( + 10, + ), + kind: None, + range: 45..47, + }, + ), + ], + range: 41..47, }, - ], - is_async: false, - range: 18..47, - }, - ], - range: 0..48, - }, - ), -} + ), + ], + is_async: false, + range: PhantomData, + }, + ], + 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 4d8aecc..6c72de4 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 @@ -3,34 +3,25 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 0..14, - }, - ), - }, - ], - range: 0..14, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "Hello world", + ), + kind: None, + range: 0..14, + }, + ), + ], + 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 fbe7f39..c7f037a 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 @@ -2,54 +2,42 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: GeneratorExp( - ExprGeneratorExp { - elt: Attributed { - custom: (), - node: Name( +GeneratorExp( + ExprGeneratorExp { + elt: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1..2, + }, + ), + generators: [ + Comprehension { + target: Name( ExprName { id: Identifier( - "x", + "y", ), - ctx: Load, - range: 1..2, + ctx: Store, + range: 7..8, }, ), + iter: Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Load, + range: 12..13, + }, + ), + ifs: [], + is_async: false, + range: PhantomData, }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 7..8, - }, - ), - }, - iter: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Load, - range: 12..13, - }, - ), - }, - ifs: [], - is_async: false, - range: 3..13, - }, - ], - range: 0..14, - }, - ), -} + ], + 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 e8b6ecb..6ab4b49 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 @@ -3,112 +3,82 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: If( - StmtIf { - test: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 3..4, - }, + If( + StmtIf { + test: Constant( + ExprConstant { + value: Int( + 1, ), + kind: None, + range: 3..4, }, - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 10, - ), - kind: None, - range: 6..8, - }, - ), - }, + ), + body: [ + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Int( + 10, + ), + kind: None, range: 6..8, }, ), + range: 6..8, }, - ], - orelse: [ - Attributed { - custom: (), - node: If( - StmtIf { - test: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 14..15, - }, - ), - }, - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 20, - ), - kind: None, - range: 17..19, - }, - ), - }, - range: 17..19, - }, - ), - }, - ], - orelse: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 30, - ), - kind: None, - range: 26..28, - }, - ), - }, - range: 26..28, - }, - ), - }, - ], - range: 9..28, + ), + ], + orelse: [ + If( + StmtIf { + test: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 14..15, }, ), + body: [ + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Int( + 20, + ), + kind: None, + range: 17..19, + }, + ), + range: 17..19, + }, + ), + ], + orelse: [ + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Int( + 30, + ), + kind: None, + range: 26..28, + }, + ), + range: 26..28, + }, + ), + ], + range: 9..28, }, - ], - range: 0..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 f3a9426..02f20b0 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 @@ -2,86 +2,65 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: GeneratorExp( - ExprGeneratorExp { - elt: Attributed { - custom: (), - node: IfExp( - ExprIfExp { - test: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 6..7, - }, - ), - }, - body: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1..2, - }, - ), - }, - orelse: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 13..14, - }, - ), - }, - range: 1..14, +GeneratorExp( + ExprGeneratorExp { + elt: IfExp( + ExprIfExp { + test: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Load, + range: 6..7, }, ), + body: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1..2, + }, + ), + orelse: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Load, + range: 13..14, + }, + ), + range: 1..14, }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 19..20, - }, + ), + generators: [ + Comprehension { + target: Name( + ExprName { + id: Identifier( + "y", ), + ctx: Store, + range: 19..20, }, - iter: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Load, - range: 24..25, - }, + ), + iter: Name( + ExprName { + id: Identifier( + "z", ), + ctx: Load, + range: 24..25, }, - ifs: [], - is_async: false, - range: 15..25, - }, - ], - range: 0..26, - }, - ), -} + ), + ifs: [], + is_async: false, + range: PhantomData, + }, + ], + 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 0d08016..4e29e9c 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap @@ -3,71 +3,53 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "my_func", - ), - ctx: Load, - range: 0..7, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "positional", - ), - kind: None, - range: 8..20, - }, - ), - }, - ], - keywords: [ - Attributed { - custom: (), - node: KeywordData { - arg: Some( - Identifier( - "keyword", - ), - ), - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 30..31, - }, - ), - }, - range: 22..31, - }, - }, - ], - range: 0..32, + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "my_func", + ), + ctx: Load, + range: 0..7, }, ), + args: [ + Constant( + ExprConstant { + value: Str( + "positional", + ), + kind: None, + range: 8..20, + }, + ), + ], + keywords: [ + Keyword { + arg: Some( + Identifier( + "keyword", + ), + ), + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 30..31, + }, + ), + range: 22..31, + }, + ], + range: 0..32, }, - 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 cadfa03..4311985 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap @@ -3,86 +3,65 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Lambda( - ExprLambda { - args: Arguments { - posonlyargs: [], - args: [ - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "x", - ), - annotation: None, - type_comment: None, - range: 7..8, - }, - }, - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "y", - ), - annotation: None, - type_comment: None, - range: 10..11, - }, - }, - ], - vararg: None, - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 7..11, - }, - body: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 13..14, - }, - ), - }, - op: Mult, - right: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 17..18, - }, - ), - }, - range: 13..18, - }, + Expr( + StmtExpr { + value: Lambda( + ExprLambda { + args: Arguments { + posonlyargs: [], + args: [ + Arg { + arg: Identifier( + "x", ), + annotation: None, + type_comment: None, + range: 7..8, }, - range: 0..18, + Arg { + arg: Identifier( + "y", + ), + annotation: None, + type_comment: None, + range: 10..11, + }, + ], + vararg: None, + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: BinOp( + ExprBinOp { + left: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 13..14, + }, + ), + op: Mult, + right: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Load, + range: 17..18, + }, + ), + range: 13..18, }, ), + range: 0..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 3ffdf29..2789a0d 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 @@ -2,54 +2,42 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: ListComp( - ExprListComp { - elt: Attributed { - custom: (), - node: Name( +ListComp( + ExprListComp { + elt: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1..2, + }, + ), + generators: [ + Comprehension { + target: Name( ExprName { id: Identifier( - "x", + "y", ), - ctx: Load, - range: 1..2, + ctx: Store, + range: 7..8, }, ), + iter: Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Load, + range: 12..13, + }, + ), + ifs: [], + is_async: false, + range: PhantomData, }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 7..8, - }, - ), - }, - iter: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Load, - range: 12..13, - }, - ), - }, - ifs: [], - is_async: false, - range: 3..13, - }, - ], - range: 0..14, - }, - ), -} + ], + 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 ebb73c2..c1cece1 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 @@ -2,95 +2,71 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: GeneratorExp( - ExprGeneratorExp { - elt: Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 1..2, - }, - ), - }, - value: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Load, - range: 6..7, - }, - ), - }, - op: Add, - right: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 10..11, - }, - ), - }, - range: 6..11, - }, - ), - }, - range: 1..11, +GeneratorExp( + ExprGeneratorExp { + elt: NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 1..2, }, ), - }, - generators: [ - Comprehension { - target: Attributed { - custom: (), - node: Name( + value: BinOp( + ExprBinOp { + left: Name( ExprName { id: Identifier( "y", ), - ctx: Store, - range: 16..17, - }, - ), - }, - iter: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), ctx: Load, - range: 21..22, + range: 6..7, }, ), + op: Add, + right: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 10..11, + }, + ), + range: 6..11, }, - ifs: [], - is_async: false, - range: 12..22, - }, - ], - range: 0..23, - }, - ), -} + ), + range: 1..11, + }, + ), + generators: [ + Comprehension { + target: Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 16..17, + }, + ), + iter: Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Load, + range: 21..22, + }, + ), + ifs: [], + is_async: false, + range: PhantomData, + }, + ], + 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 caabd41..d5c6d0e 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 @@ -3,59 +3,44 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "print", - ), - ctx: Load, - range: 0..5, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 6..19, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 21..22, - }, - ), - }, - ], - keywords: [], - range: 0..23, + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 0..5, }, ), + args: [ + Constant( + ExprConstant { + value: Str( + "Hello world", + ), + kind: None, + range: 6..19, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 21..22, + }, + ), + ], + keywords: [], + range: 0..23, }, - 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 bd898ed..a214015 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 @@ -3,47 +3,35 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "print", - ), - ctx: Load, - range: 0..5, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 6..19, - }, - ), - }, - ], - keywords: [], - range: 0..20, + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 0..5, }, ), + args: [ + Constant( + ExprConstant { + value: Str( + "Hello world", + ), + kind: None, + range: 6..19, + }, + ), + ], + keywords: [], + range: 0..20, }, - 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 0d99447..d2a0dfa 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap @@ -3,24 +3,18 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 0..13, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "Hello world", ), + kind: None, + range: 0..13, }, - 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 c14c8d5..1d8fb5d 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap @@ -3,85 +3,64 @@ source: parser/src/parser.rs expression: "parse_program(source, \"\").unwrap()" --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Store, - range: 0..1, - }, - ), - }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Store, - range: 3..4, - }, - ), - }, - ], - ctx: Store, - range: 0..4, + Assign( + StmtAssign { + targets: [ + Tuple( + ExprTuple { + elts: [ + Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Store, + range: 0..1, + }, + ), + Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Store, + range: 3..4, + }, + ), + ], + ctx: Store, + range: 0..4, + }, + ), + ], + value: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 4, + ), + kind: None, + range: 7..8, }, ), - }, - ], - value: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 4, - ), - kind: None, - range: 7..8, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 5, - ), - kind: None, - range: 10..11, - }, - ), - }, - ], - ctx: Load, - range: 7..11, - }, - ), + Constant( + ExprConstant { + value: Int( + 5, + ), + kind: None, + range: 10..11, + }, + ), + ], + ctx: Load, + range: 7..11, }, - type_comment: None, - range: 0..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 6ac57e0..fcb9e96 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__patma.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__patma.snap @@ -3,5025 +3,3909 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 73..74, - }, + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", ), + ctx: Load, + range: 73..74, }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: UnaryOp( - ExprUnaryOp { - op: USub, - operand: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Complex { - real: 0.0, - imag: 0.0, - }, - kind: None, - range: 86..88, - }, - ), - }, - range: 85..88, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: UnaryOp( + ExprUnaryOp { + op: USub, + operand: Constant( + ExprConstant { + value: Complex { + real: 0.0, + imag: 0.0, }, - ), - }, + kind: None, + range: 86..88, + }, + ), range: 85..88, }, ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 98..99, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 102..103, - }, - ), - }, - type_comment: None, - range: 98..103, - }, - ), - }, - ], - range: 80..126, - }, - ], - range: 67..103, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 132..133, + range: 85..88, }, ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchClass( - PatternMatchClass { - cls: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "bytes", - ), - ctx: Load, - range: 144..149, - }, - ), - }, - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "z", - ), - ), - range: 150..151, - }, + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", ), + ctx: Store, + range: 98..99, }, - ], - kwd_attrs: [], - kwd_patterns: [], - range: 144..152, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 162..163, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 166..167, - }, - ), - }, - type_comment: None, - range: 162..167, - }, - ), - }, - ], - range: 139..190, - }, - ], - range: 126..167, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 196..197, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 208..209, - }, - ), - }, - range: 208..209, - }, - ), - }, - guard: Some( - Attributed { - custom: (), - node: Constant( + ), + ], + value: Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 213..214, + range: 102..103, }, ), + type_comment: None, + range: 98..103, }, ), - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 224..225, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 228..229, - }, + ], + range: PhantomData, + }, + ], + range: 67..103, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 132..133, + }, + ), + cases: [ + MatchCase { + pattern: MatchClass( + PatternMatchClass { + cls: Name( + ExprName { + id: Identifier( + "bytes", + ), + ctx: Load, + range: 144..149, + }, + ), + patterns: [ + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "z", ), - }, - type_comment: None, - range: 224..229, + ), + range: 150..151, }, ), - }, - ], - range: 203..234, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 239..240, - }, + ], + kwd_attrs: [], + kwd_patterns: [], + range: 144..152, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 162..163, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, ), + kind: None, + range: 166..167, }, + ), + type_comment: None, + range: 162..167, + }, + ), + ], + range: PhantomData, + }, + ], + range: 126..167, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 196..197, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 208..209, + }, + ), + range: 208..209, + }, + ), + guard: Some( + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 213..214, + }, + ), + ), + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 224..225, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 228..229, + }, + ), + type_comment: None, + range: 224..229, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, range: 239..240, }, ), + range: 239..240, }, - guard: Some( - Attributed { - custom: (), - node: Constant( + ), + guard: Some( + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 244..245, + }, + ), + ), + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 255..256, + }, + ), + ], + value: Constant( ExprConstant { value: Int( 1, ), kind: None, - range: 244..245, + range: 259..260, }, ), + type_comment: None, + range: 255..260, }, ), - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 255..256, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 259..260, - }, - ), - }, - type_comment: None, - range: 255..260, - }, - ), - }, - ], - range: 234..283, - }, - ], - range: 190..260, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 289..290, - }, - ), + ], + range: PhantomData, }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 301..302, - }, - ), - }, - range: 301..302, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 305..306, - }, - ), - }, - range: 305..306, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 309..310, - }, - ), - }, - range: 309..310, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 313..314, - }, - ), - }, - range: 313..314, - }, - ), - }, - ], - range: 301..314, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 324..325, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Bool( - true, - ), - kind: None, - range: 328..332, - }, - ), - }, - type_comment: None, - range: 324..332, - }, - ), - }, - ], - range: 296..355, - }, - ], - range: 283..332, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 361..362, - }, + ], + range: 190..260, + }, + ), + Match( + StmtMatch { + subject: Constant( + ExprConstant { + value: Int( + 3, ), + kind: None, + range: 289..290, }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 374..375, - }, - ), - }, - range: 374..375, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 377..378, - }, - ), - }, - range: 377..378, - }, - ), - }, - ], - range: 373..379, - }, - ), - }, - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 383..384, - }, - ), - }, - range: 383..384, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 386..387, - }, - ), - }, - range: 386..387, - }, - ), - }, - ], - range: 382..388, - }, - ), - }, - ], - range: 373..388, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 398..399, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 402..403, - }, - ), - }, - type_comment: None, - range: 398..403, - }, - ), - }, - ], - range: 368..445, - }, - ], - range: 355..403, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 451..452, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchStar( - PatternMatchStar { - name: None, - range: 464..466, - }, - ), - }, - ], - range: 463..467, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Return( - StmtReturn { - value: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "seq", - ), - kind: None, - range: 484..489, - }, - ), - }, - ), - range: 477..489, - }, - ), - }, - ], - range: 458..494, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: None, - range: 499..501, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Return( - StmtReturn { - value: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "map", - ), - kind: None, - range: 518..523, - }, - ), - }, - ), - range: 511..523, - }, - ), - }, - ], - range: 494..546, - }, - ], - range: 445..523, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 552..553, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 565..566, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 569..570, - }, - ), - }, - range: 569..570, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 572..573, - }, - ), - }, - range: 572..573, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: None, - range: 575..577, - }, - ), - }, - ], - range: 568..578, - }, - ), - }, - ], - rest: None, - range: 564..579, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 589..590, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 593..594, - }, - ), - }, - type_comment: None, - range: 589..594, - }, - ), - }, - ], - range: 559..599, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 605..606, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 609..610, - }, - ), - }, - range: 609..610, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 612..613, - }, - ), - }, - range: 612..613, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: None, - range: 615..617, - }, - ), - }, - ], - range: 608..618, - }, - ), - }, - Attributed { - custom: (), - node: MatchSingleton( - PatternMatchSingleton { - value: Bool( - true, - ), - range: 621..625, - }, - ), - }, - ], - range: 608..625, - }, - ), - }, - ], - rest: None, - range: 604..626, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 630..631, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [], - range: 634..636, - }, - ), - }, - ], - range: 633..637, - }, - ), - }, - ], - rest: None, - range: 629..638, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 642..643, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 646..647, - }, - ), - }, - range: 646..647, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 649..650, - }, - ), - }, - range: 649..650, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: None, - range: 652..654, - }, - ), - }, - ], - range: 645..655, - }, - ), - }, - ], - rest: None, - range: 641..656, - }, - ), - }, - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [], - range: 659..661, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "X", - ), - kind: None, - range: 664..667, - }, - ), - }, - range: 664..667, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: None, - range: 670..672, - }, - ), - }, - ], - range: 604..672, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 682..683, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 686..687, - }, - ), - }, - type_comment: None, - range: 682..687, - }, - ), - }, - ], - range: 599..692, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [], - range: 697..699, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 709..710, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 713..714, - }, - ), - }, - type_comment: None, - range: 709..714, - }, - ), - }, - ], - range: 692..737, - }, - ], - range: 546..714, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 743..744, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Float( - 0.25, - ), - kind: None, - range: 755..759, - }, - ), - }, - op: Add, - right: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Complex { - real: 0.0, - imag: 1.75, - }, - kind: None, - range: 762..767, - }, - ), - }, - range: 755..767, - }, - ), - }, - range: 755..767, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 777..778, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 781..782, - }, - ), - }, - type_comment: None, - range: 777..782, - }, - ), - }, - ], - range: 750..805, - }, - ], - range: 737..782, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 811..812, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: UnaryOp( - ExprUnaryOp { - op: USub, - operand: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Complex { - real: 0.0, - imag: 0.0, - }, - kind: None, - range: 824..826, - }, - ), - }, - range: 823..826, - }, - ), - }, - range: 823..826, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 836..837, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 840..841, - }, - ), - }, - type_comment: None, - range: 836..841, - }, - ), - }, - ], - range: 818..864, - }, - ], - range: 805..841, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 4, - ), - kind: None, - range: 870..871, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 882..883, - }, - ), - }, - range: 882..883, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 886..887, - }, - ), - }, - range: 886..887, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 890..891, - }, - ), - }, - range: 890..891, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 894..895, - }, - ), - }, - range: 894..895, - }, - ), - }, - ], - range: 882..895, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 905..906, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Bool( - true, - ), - kind: None, - range: 909..913, - }, - ), - }, - type_comment: None, - range: 905..913, - }, - ), - }, - ], - range: 877..936, - }, - ], - range: 864..913, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 942..943, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( + ), + cases: [ + MatchCase { + pattern: MatchOr( + PatternMatchOr { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 954..955, + range: 301..302, }, ), - }, - range: 954..955, - }, - ), - }, - guard: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 959..960, + range: 301..302, }, ), - }, - ), - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 970..971, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 974..975, - }, - ), - }, - type_comment: None, - range: 970..975, - }, - ), - }, - ], - range: 949..998, - }, - ], - range: 936..975, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1004..1005, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1017..1018, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1020..1021, - }, - ), - }, - range: 1020..1021, - }, - ), - }, - ], - rest: None, - range: 1016..1022, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1032..1033, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1036..1037, - }, - ), - }, - type_comment: None, - range: 1032..1037, - }, - ), - }, - ], - range: 1011..1042, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1048..1049, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1051..1052, - }, - ), - }, - range: 1051..1052, - }, - ), - }, - ], - rest: None, - range: 1047..1053, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1063..1064, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1067..1068, - }, - ), - }, - type_comment: None, - range: 1063..1068, - }, - ), - }, - ], - range: 1042..1073, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: Some( - Identifier( - "z", - ), - ), - range: 1078..1083, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1093..1094, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 1097..1098, - }, - ), - }, - type_comment: None, - range: 1093..1098, - }, - ), - }, - ], - range: 1073..1121, - }, - ], - range: 998..1098, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "Seq", - ), - ctx: Load, - range: 1127..1130, - }, - ), - }, - args: [], - keywords: [], - range: 1127..1132, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchStar( - PatternMatchStar { - name: None, - range: 1144..1146, - }, - ), - }, - ], - range: 1143..1147, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1157..1158, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1161..1162, - }, - ), - }, - type_comment: None, - range: 1157..1162, - }, - ), - }, - ], - range: 1138..1185, - }, - ], - range: 1121..1162, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1191..1192, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( + MatchValue( + PatternMatchValue { + value: Constant( ExprConstant { value: Int( 1, ), kind: None, - range: 1203..1204, + range: 305..306, }, ), - }, - range: 1203..1204, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1214..1215, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1218..1219, - }, - ), - }, - type_comment: None, - range: 1214..1219, + range: 305..306, }, ), - }, - ], - range: 1198..1224, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( + MatchValue( + PatternMatchValue { + value: Constant( ExprConstant { value: Int( - 1, + 2, ), kind: None, - range: 1229..1230, + range: 309..310, }, ), - }, - range: 1229..1230, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1240..1241, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1244..1245, - }, - ), - }, - type_comment: None, - range: 1240..1245, + range: 309..310, }, ), - }, - ], - range: 1224..1268, - }, - ], - range: 1185..1245, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1274..1275, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "foo", - ), - kind: None, - range: 1287..1292, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "bar", - ), - ), - range: 1294..1297, - }, - ), - }, - ], - rest: None, - range: 1286..1298, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1308..1309, - }, + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 3, ), + kind: None, + range: 313..314, }, - ], - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "bar", - ), - ctx: Load, - range: 1312..1315, - }, - ), - }, - type_comment: None, - range: 1308..1315, + ), + range: 313..314, }, ), - }, - ], - range: 1281..1338, - }, - ], - range: 1268..1315, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1345..1346, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1348..1349, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 1351..1352, - }, - ), - }, ], - ctx: Load, - range: 1344..1353, + range: 301..314, }, ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1365..1366, - }, - ), - }, - range: 1365..1366, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1368..1369, - }, - ), - }, - range: 1368..1369, - }, - ), - }, - Attributed { - custom: (), - node: MatchStar( - PatternMatchStar { - name: Some( - Identifier( - "x", - ), - ), - range: 1371..1373, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 1375..1376, - }, - ), - }, - range: 1375..1376, - }, - ), - }, - ], - range: 1364..1377, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1387..1388, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1391..1392, - }, - ), - }, - type_comment: None, - range: 1387..1392, - }, - ), - }, - ], - range: 1359..1415, - }, - ], - range: 1338..1392, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1421..1422, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1434..1435, - }, - ), - }, - range: 1434..1435, - }, - ), - }, - ], - range: 1433..1436, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1446..1447, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1450..1451, - }, - ), - }, - type_comment: None, - range: 1446..1451, - }, - ), - }, - ], - range: 1428..1456, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1462..1463, - }, - ), - }, - range: 1462..1463, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1465..1466, - }, - ), - }, - range: 1465..1466, - }, - ), - }, - ], - range: 1461..1467, - }, - ), - }, - guard: Some( - Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 1472..1473, - }, - ), - }, - value: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1477..1478, - }, - ), - }, - slice: Attributed { - custom: (), - node: Slice( - ExprSlice { - lower: None, - upper: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1480..1481, - }, - ), - }, - ), - step: None, - range: 1479..1481, - }, - ), - }, - ctx: Load, - range: 1477..1482, - }, - ), - }, - range: 1472..1482, - }, - ), - }, - ), - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1493..1494, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1497..1498, - }, - ), - }, - type_comment: None, - range: 1493..1498, - }, - ), - }, - ], - range: 1456..1503, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 1509..1510, - }, - ), - }, - range: 1509..1510, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1512..1513, - }, - ), - }, - range: 1512..1513, - }, - ), - }, - ], - range: 1508..1514, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1524..1525, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 1528..1529, - }, - ), - }, - type_comment: None, - range: 1524..1529, - }, - ), - }, - ], - range: 1503..1552, - }, - ], - range: 1415..1529, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "w", - ), - ctx: Load, - range: 1558..1559, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "x", - ), - ), - range: 1571..1572, - }, - ), - }, - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "y", - ), - ), - range: 1574..1575, - }, - ), - }, - Attributed { - custom: (), - node: MatchStar( - PatternMatchStar { - name: None, - range: 1577..1579, - }, - ), - }, - ], - range: 1570..1580, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Store, - range: 1590..1591, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1594..1595, - }, - ), - }, - type_comment: None, - range: 1590..1595, - }, - ), - }, - ], - range: 1565..1618, - }, - ], - range: 1552..1595, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1624..1625, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: UnaryOp( - ExprUnaryOp { - op: USub, - operand: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Float( - 0.25, - ), - kind: None, - range: 1637..1641, - }, - ), - }, - range: 1636..1641, - }, - ), - }, - op: Sub, - right: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Complex { - real: 0.0, - imag: 1.75, - }, - kind: None, - range: 1644..1649, - }, - ), - }, - range: 1636..1649, - }, - ), - }, - range: 1636..1649, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1659..1660, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1663..1664, - }, - ), - }, - type_comment: None, - range: 1659..1664, - }, - ), - }, - ], - range: 1631..1687, - }, - ], - range: 1618..1664, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Name( + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( ExprName { id: Identifier( "x", ), - ctx: Load, - range: 1694..1695, + ctx: Store, + range: 324..325, }, ), - }, - ], - ctx: Load, - range: 1693..1697, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "y", - ), - ), - range: 1709..1710, - }, - ), - }, - ], - range: 1708..1711, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Store, - range: 1721..1722, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1725..1726, - }, - ), - }, - type_comment: None, - range: 1721..1726, + ], + value: Constant( + ExprConstant { + value: Bool( + true, + ), + kind: None, + range: 328..332, }, ), + type_comment: None, + range: 324..332, }, - ], - range: 1703..1749, - }, - ], - range: 1687..1726, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1755..1756, - }, - ), + ), + ], + range: PhantomData, }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "A", - ), - ctx: Load, - range: 1767..1768, - }, - ), - }, - attr: Identifier( - "B", - ), - ctx: Load, - range: 1767..1770, - }, - ), - }, - attr: Identifier( - "C", + ], + range: 283..332, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 361..362, + }, + ), + cases: [ + MatchCase { + pattern: MatchOr( + PatternMatchOr { + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, ), - ctx: Load, - range: 1767..1772, + kind: None, + range: 374..375, }, ), - }, - attr: Identifier( - "D", - ), - ctx: Load, - range: 1767..1774, - }, - ), - }, - range: 1767..1774, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1784..1785, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1788..1789, + range: 374..375, }, ), - }, - type_comment: None, - range: 1784..1789, - }, - ), - }, - ], - range: 1762..1812, - }, - ], - range: 1749..1789, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1818..1819, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSingleton( - PatternMatchSingleton { - value: None, - range: 1830..1834, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1844..1845, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1848..1849, - }, - ), - }, - type_comment: None, - range: 1844..1849, - }, - ), - }, - ], - range: 1825..1872, - }, - ], - range: 1812..1849, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1878..1879, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1890..1891, - }, - ), - }, - range: 1890..1891, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1901..1902, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1905..1906, - }, - ), - }, - type_comment: None, - range: 1901..1906, - }, - ), - }, - ], - range: 1885..1929, - }, - ], - range: 1872..1906, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1935..1936, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSingleton( - PatternMatchSingleton { - value: Bool( - false, - ), - range: 1947..1952, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 1962..1963, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 1966..1967, - }, - ), - }, - type_comment: None, - range: 1962..1967, - }, - ), - }, - ], - range: 1942..1990, - }, - ], - range: 1929..1967, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 1996..1997, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [], - range: 2008..2010, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2020..2021, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2024..2025, - }, - ), - }, - type_comment: None, - range: 2020..2025, - }, - ), - }, - ], - range: 2003..2030, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( + MatchValue( PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "", - ), - kind: None, - range: 2036..2038, + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 377..378, + }, + ), + range: 377..378, + }, + ), + ], + range: 373..379, + }, + ), + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 383..384, + }, + ), + range: 383..384, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 386..387, + }, + ), + range: 386..387, + }, + ), + ], + range: 382..388, + }, + ), + ], + range: 373..388, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 398..399, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 402..403, + }, + ), + type_comment: None, + range: 398..403, + }, + ), + ], + range: PhantomData, + }, + ], + range: 355..403, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 451..452, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchStar( + PatternMatchStar { + name: None, + range: 464..466, + }, + ), + ], + range: 463..467, + }, + ), + guard: None, + body: [ + Return( + StmtReturn { + value: Some( + Constant( + ExprConstant { + value: Str( + "seq", + ), + kind: None, + range: 484..489, + }, + ), + ), + range: 477..489, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: None, + range: 499..501, + }, + ), + guard: None, + body: [ + Return( + StmtReturn { + value: Some( + Constant( + ExprConstant { + value: Str( + "map", + ), + kind: None, + range: 518..523, + }, + ), + ), + range: 511..523, + }, + ), + ], + range: PhantomData, + }, + ], + range: 445..523, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 552..553, + }, + ), + cases: [ + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { + keys: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 565..566, + }, + ), + ], + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 569..570, + }, + ), + range: 569..570, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 572..573, + }, + ), + range: 572..573, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: None, + range: 575..577, + }, + ), + ], + range: 568..578, + }, + ), + ], + rest: None, + range: 564..579, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 589..590, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 593..594, + }, + ), + type_comment: None, + range: 589..594, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchOr( + PatternMatchOr { + patterns: [ + MatchMapping( + PatternMatchMapping { + keys: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 605..606, + }, + ), + ], + patterns: [ + MatchOr( + PatternMatchOr { + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 609..610, + }, + ), + range: 609..610, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 612..613, + }, + ), + range: 612..613, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: None, + range: 615..617, + }, + ), + ], + range: 608..618, }, ), - }, - range: 2036..2038, + MatchSingleton( + PatternMatchSingleton { + value: Bool( + true, + ), + range: 621..625, + }, + ), + ], + range: 608..625, }, ), - }, - ], - range: 2035..2039, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2049..2050, - }, - ), - }, ], - value: Attributed { - custom: (), - node: Constant( + rest: None, + range: 604..626, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [ + Constant( ExprConstant { value: Int( 1, ), kind: None, - range: 2053..2054, + range: 630..631, }, ), - }, - type_comment: None, - range: 2049..2054, + ], + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [], + range: 634..636, + }, + ), + ], + range: 633..637, + }, + ), + ], + rest: None, + range: 629..638, }, ), + MatchMapping( + PatternMatchMapping { + keys: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 642..643, + }, + ), + ], + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 646..647, + }, + ), + range: 646..647, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 649..650, + }, + ), + range: 649..650, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: None, + range: 652..654, + }, + ), + ], + range: 645..655, + }, + ), + ], + rest: None, + range: 641..656, + }, + ), + MatchSequence( + PatternMatchSequence { + patterns: [], + range: 659..661, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Str( + "X", + ), + kind: None, + range: 664..667, + }, + ), + range: 664..667, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: None, + range: 670..672, + }, + ), + ], + range: 604..672, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 682..683, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 686..687, + }, + ), + type_comment: None, + range: 682..687, }, - ], - range: 2030..2059, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [], + range: 697..699, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 709..710, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 713..714, + }, + ), + type_comment: None, + range: 709..714, + }, + ), + ], + range: PhantomData, + }, + ], + range: 546..714, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 743..744, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: BinOp( + ExprBinOp { + left: Constant( + ExprConstant { + value: Float( + 0.25, + ), + kind: None, + range: 755..759, + }, + ), + op: Add, + right: Constant( + ExprConstant { + value: Complex { + real: 0.0, + imag: 1.75, + }, + kind: None, + range: 762..767, + }, + ), + range: 755..767, + }, + ), + range: 755..767, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 777..778, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 781..782, + }, + ), + type_comment: None, + range: 777..782, + }, + ), + ], + range: PhantomData, + }, + ], + range: 737..782, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 811..812, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: UnaryOp( + ExprUnaryOp { + op: USub, + operand: Constant( + ExprConstant { + value: Complex { + real: 0.0, + imag: 0.0, + }, + kind: None, + range: 824..826, + }, + ), + range: 823..826, + }, + ), + range: 823..826, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 836..837, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 840..841, + }, + ), + type_comment: None, + range: 836..841, + }, + ), + ], + range: PhantomData, + }, + ], + range: 805..841, + }, + ), + Match( + StmtMatch { + subject: Constant( + ExprConstant { + value: Int( + 4, + ), + kind: None, + range: 870..871, + }, + ), + cases: [ + MatchCase { + pattern: MatchOr( + PatternMatchOr { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 882..883, + }, + ), + range: 882..883, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 886..887, + }, + ), + range: 886..887, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 890..891, + }, + ), + range: 890..891, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 894..895, + }, + ), + range: 894..895, + }, + ), + ], + range: 882..895, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 905..906, + }, + ), + ], + value: Constant( + ExprConstant { + value: Bool( + true, + ), + kind: None, + range: 909..913, + }, + ), + type_comment: None, + range: 905..913, + }, + ), + ], + range: PhantomData, + }, + ], + range: 864..913, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 942..943, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 954..955, + }, + ), + range: 954..955, + }, + ), + guard: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 959..960, + }, + ), + ), + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 970..971, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 974..975, + }, + ), + type_comment: None, + range: 970..975, + }, + ), + ], + range: PhantomData, + }, + ], + range: 936..975, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + 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: PhantomData, + }, + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { + keys: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1048..1049, + }, + ), + ], + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1051..1052, + }, + ), + range: 1051..1052, + }, + ), + ], + rest: None, + range: 1047..1053, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1063..1064, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1067..1068, + }, + ), + type_comment: None, + range: 1063..1068, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: Some( + Identifier( + "z", + ), + ), + range: 1078..1083, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1093..1094, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 1097..1098, + }, + ), + type_comment: None, + range: 1093..1098, + }, + ), + ], + range: PhantomData, + }, + ], + range: 998..1098, + }, + ), + Match( + StmtMatch { + subject: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "Seq", + ), + ctx: Load, + range: 1127..1130, + }, + ), + args: [], + keywords: [], + range: 1127..1132, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchStar( + PatternMatchStar { + name: None, + range: 1144..1146, + }, + ), + ], + range: 1143..1147, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1157..1158, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1161..1162, + }, + ), + type_comment: None, + range: 1157..1162, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1121..1162, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1191..1192, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1203..1204, + }, + ), + range: 1203..1204, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1214..1215, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1218..1219, + }, + ), + type_comment: None, + range: 1214..1219, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1229..1230, + }, + ), + range: 1229..1230, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1240..1241, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1244..1245, + }, + ), + type_comment: None, + range: 1240..1245, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1185..1245, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1274..1275, + }, + ), + cases: [ + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { + keys: [ + Constant( + ExprConstant { + value: Str( + "foo", + ), + kind: None, + range: 1287..1292, + }, + ), + ], + patterns: [ + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "bar", + ), + ), + range: 1294..1297, + }, + ), + ], + rest: None, + range: 1286..1298, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1308..1309, + }, + ), + ], + value: Name( + ExprName { + id: Identifier( + "bar", + ), + ctx: Load, + range: 1312..1315, + }, + ), + type_comment: None, + range: 1308..1315, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1268..1315, + }, + ), + Match( + StmtMatch { + subject: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1345..1346, + }, + ), + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1348..1349, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 1351..1352, + }, + ), + ], + ctx: Load, + range: 1344..1353, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1365..1366, + }, + ), + range: 1365..1366, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1368..1369, + }, + ), + range: 1368..1369, + }, + ), + MatchStar( + PatternMatchStar { + name: Some( + Identifier( + "x", + ), + ), + range: 1371..1373, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 1375..1376, + }, + ), + range: 1375..1376, + }, + ), + ], + range: 1364..1377, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1387..1388, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1391..1392, + }, + ), + type_comment: None, + range: 1387..1392, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1338..1392, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1421..1422, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1434..1435, + }, + ), + range: 1434..1435, + }, + ), + ], + range: 1433..1436, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1446..1447, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1450..1451, + }, + ), + type_comment: None, + range: 1446..1451, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1462..1463, + }, + ), + range: 1462..1463, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1465..1466, + }, + ), + range: 1465..1466, + }, + ), + ], + range: 1461..1467, + }, + ), + guard: Some( + NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 1472..1473, + }, + ), + value: Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1477..1478, + }, + ), + slice: Slice( + ExprSlice { + lower: None, + upper: Some( + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1480..1481, + }, + ), + ), + step: None, + range: 1479..1481, + }, + ), + ctx: Load, + range: 1477..1482, + }, + ), + range: 1472..1482, + }, + ), + ), + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1493..1494, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1497..1498, + }, + ), + type_comment: None, + range: 1493..1498, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 1509..1510, + }, + ), + range: 1509..1510, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1512..1513, + }, + ), + range: 1512..1513, + }, + ), + ], + range: 1508..1514, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1524..1525, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 1528..1529, + }, + ), + type_comment: None, + range: 1524..1529, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1415..1529, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "w", + ), + ctx: Load, + range: 1558..1559, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "x", + ), + ), + range: 1571..1572, + }, + ), + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "y", + ), + ), + range: 1574..1575, + }, + ), + MatchStar( + PatternMatchStar { + name: None, + range: 1577..1579, + }, + ), + ], + range: 1570..1580, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Store, + range: 1590..1591, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1594..1595, + }, + ), + type_comment: None, + range: 1590..1595, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1552..1595, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1624..1625, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: BinOp( + ExprBinOp { + left: UnaryOp( + ExprUnaryOp { + op: USub, + operand: Constant( + ExprConstant { + value: Float( + 0.25, + ), + kind: None, + range: 1637..1641, + }, + ), + range: 1636..1641, + }, + ), + op: Sub, + right: Constant( + ExprConstant { + value: Complex { + real: 0.0, + imag: 1.75, + }, + kind: None, + range: 1644..1649, + }, + ), + range: 1636..1649, + }, + ), + range: 1636..1649, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1659..1660, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1663..1664, + }, + ), + type_comment: None, + range: 1659..1664, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1618..1664, + }, + ), + Match( + StmtMatch { + subject: Tuple( + ExprTuple { + elts: [ + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1694..1695, + }, + ), + ], + ctx: Load, + range: 1693..1697, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "y", + ), + ), + range: 1709..1710, + }, + ), + ], + range: 1708..1711, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Store, + range: 1721..1722, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1725..1726, + }, + ), + type_comment: None, + range: 1721..1726, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1687..1726, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1755..1756, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Attribute( + ExprAttribute { + value: Attribute( + ExprAttribute { + value: Attribute( + ExprAttribute { + value: Name( + ExprName { + 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 { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1784..1785, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1788..1789, + }, + ), + type_comment: None, + range: 1784..1789, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1749..1789, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1818..1819, + }, + ), + cases: [ + MatchCase { + pattern: MatchSingleton( + PatternMatchSingleton { + value: None, + range: 1830..1834, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1844..1845, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1848..1849, + }, + ), + type_comment: None, + range: 1844..1849, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1812..1849, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1878..1879, + }, + ), + cases: [ + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1890..1891, + }, + ), + range: 1890..1891, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1901..1902, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1905..1906, + }, + ), + type_comment: None, + range: 1901..1906, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1872..1906, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1935..1936, + }, + ), + cases: [ + MatchCase { + pattern: MatchSingleton( + PatternMatchSingleton { + value: Bool( + false, + ), + range: 1947..1952, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 1962..1963, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 1966..1967, + }, + ), + type_comment: None, + range: 1962..1967, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1929..1967, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 1996..1997, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [], + range: 2008..2010, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2020..2021, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2024..2025, + }, + ), + type_comment: None, + range: 2020..2025, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( ExprConstant { value: Str( "", ), kind: None, - range: 2064..2066, + range: 2036..2038, }, ), + range: 2036..2038, }, + ), + ], + range: 2035..2039, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2049..2050, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2053..2054, + }, + ), + type_comment: None, + range: 2049..2054, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Str( + "", + ), + kind: None, range: 2064..2066, }, ), + range: 2064..2066, }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2076..2077, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2076..2077, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2080..2081, + }, + ), + type_comment: None, + range: 2076..2081, + }, + ), + ], + range: PhantomData, + }, + ], + range: 1990..2081, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 2110..2111, + }, + ), + cases: [ + MatchCase { + pattern: MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "z", + ), + ), + range: 2122..2123, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2133..2134, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2137..2138, + }, + ), + type_comment: None, + range: 2133..2138, + }, + ), + ], + range: PhantomData, + }, + ], + range: 2104..2138, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "w", + ), + ctx: Load, + range: 2167..2168, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "x", + ), + ), + range: 2180..2181, + }, + ), + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "y", + ), + ), + range: 2183..2184, + }, + ), + MatchStar( + PatternMatchStar { + name: Some( + Identifier( + "rest", + ), + ), + range: 2186..2191, + }, + ), + ], + range: 2179..2192, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Store, + range: 2202..2203, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2206..2207, + }, + ), + type_comment: None, + range: 2202..2207, + }, + ), + ], + range: PhantomData, + }, + ], + range: 2161..2207, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 2236..2237, + }, + ), + cases: [ + MatchCase { + pattern: MatchOr( + PatternMatchOr { + patterns: [ + MatchAs( + PatternMatchAs { + pattern: Some( + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2249..2250, + }, + ), + range: 2249..2250, + }, + ), + ), + name: Some( + Identifier( + "z", + ), + ), + range: 2249..2255, + }, + ), + MatchAs( + PatternMatchAs { + pattern: Some( + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2260..2261, + }, + ), + range: 2260..2261, + }, + ), + ), + name: Some( + Identifier( + "z", + ), + ), + range: 2260..2266, + }, + ), + MatchAs( + PatternMatchAs { + pattern: Some( + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2271..2272, + }, + ), + range: 2271..2272, + }, + ), + ), + name: Some( + Identifier( + "z", + ), + ), + range: 2271..2277, + }, + ), + ], + range: 2248..2278, + }, + ), + guard: Some( + Compare( + ExprCompare { + left: Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Load, + range: 2282..2283, + }, + ), + ops: [ + Eq, + ], + comparators: [ + BinOp( + ExprBinOp { + left: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 2287..2288, + }, + ), + op: Mod, + right: Constant( ExprConstant { value: Int( 2, ), kind: None, - range: 2080..2081, + range: 2291..2292, }, ), + range: 2287..2292, }, - type_comment: None, - range: 2076..2081, - }, - ), - }, - ], - range: 2059..2104, - }, - ], - range: 1990..2081, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 2110..2111, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "z", - ), ), - range: 2122..2123, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2133..2134, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2137..2138, - }, - ), - }, - type_comment: None, - range: 2133..2138, - }, - ), - }, - ], - range: 2117..2161, - }, - ], - range: 2104..2138, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "w", - ), - ctx: Load, - range: 2167..2168, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "x", - ), - ), - range: 2180..2181, - }, - ), - }, - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "y", - ), - ), - range: 2183..2184, - }, - ), - }, - Attributed { - custom: (), - node: MatchStar( - PatternMatchStar { - name: Some( - Identifier( - "rest", - ), - ), - range: 2186..2191, - }, - ), - }, - ], - range: 2179..2192, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Store, - range: 2202..2203, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2206..2207, - }, - ), - }, - type_comment: None, - range: 2202..2207, - }, - ), - }, - ], - range: 2174..2230, - }, - ], - range: 2161..2207, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 2236..2237, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: Some( - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2249..2250, - }, - ), - }, - range: 2249..2250, - }, - ), - }, - ), - name: Some( - Identifier( - "z", - ), - ), - range: 2249..2255, - }, - ), - }, - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: Some( - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 2260..2261, - }, - ), - }, - range: 2260..2261, - }, - ), - }, - ), - name: Some( - Identifier( - "z", - ), - ), - range: 2260..2266, - }, - ), - }, - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: Some( - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 2271..2272, - }, - ), - }, - range: 2271..2272, - }, - ), - }, - ), - name: Some( - Identifier( - "z", - ), - ), - range: 2271..2277, - }, - ), - }, - ], - range: 2248..2278, - }, - ), - }, - guard: Some( - Attributed { - custom: (), - node: Compare( - ExprCompare { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Load, - range: 2282..2283, - }, - ), - }, - ops: [ - Eq, - ], - comparators: [ - Attributed { - custom: (), - node: BinOp( - ExprBinOp { - left: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 2287..2288, - }, - ), - }, - op: Mod, - right: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 2291..2292, - }, - ), - }, - range: 2287..2292, - }, - ), - }, - ], - range: 2282..2292, - }, - ), + ], + range: 2282..2292, }, ), - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2302..2303, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2306..2307, - }, - ), - }, - type_comment: None, - range: 2302..2307, - }, - ), - }, - ], - range: 2243..2330, - }, - ], - range: 2230..2307, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 2336..2337, - }, ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2349..2350, - }, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", ), + ctx: Store, + range: 2302..2303, }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 2353..2354, - }, - ), - }, - range: 2353..2354, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 2356..2357, - }, - ), - }, - range: 2356..2357, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: None, - range: 2359..2361, - }, - ), - }, - ], - range: 2352..2362, - }, - ), - }, - ], - rest: None, - range: 2348..2363, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2373..2374, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2377..2378, - }, - ), - }, - type_comment: None, - range: 2373..2378, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2306..2307, }, ), + type_comment: None, + range: 2302..2307, }, - ], - range: 2343..2383, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2389..2390, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchOr( - PatternMatchOr { - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 2393..2394, - }, - ), - }, - range: 2393..2394, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 2396..2397, - }, - ), - }, - range: 2396..2397, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: None, - range: 2399..2401, - }, - ), - }, - ], - range: 2392..2402, - }, - ), - }, - Attributed { - custom: (), - node: MatchSingleton( - PatternMatchSingleton { - value: Bool( - false, - ), - range: 2405..2410, - }, - ), - }, - ], - range: 2392..2410, - }, - ), - }, - ], - rest: None, - range: 2388..2411, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 2415..2416, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [], - range: 2419..2421, - }, - ), - }, - ], - range: 2418..2422, - }, - ), - }, - ], - rest: None, - range: 2414..2423, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2427..2428, - }, - ), - }, - ], - patterns: [ - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 2431..2432, - }, - ), - }, - range: 2431..2432, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 2434..2435, - }, - ), - }, - range: 2434..2435, - }, - ), - }, - Attributed { - custom: (), - node: MatchMapping( - PatternMatchMapping { - keys: [], - patterns: [], - rest: None, - range: 2437..2439, - }, - ), - }, - ], - range: 2430..2440, - }, - ), - }, - ], - rest: None, - range: 2426..2441, - }, - ), - }, - Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [], - range: 2444..2446, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( + ), + ], + range: PhantomData, + }, + ], + range: 2230..2307, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 2336..2337, + }, + ), + cases: [ + MatchCase { + pattern: MatchMapping( + PatternMatchMapping { + keys: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2349..2350, + }, + ), + ], + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "X", - ), - kind: None, - range: 2449..2452, - }, - ), - }, - range: 2449..2452, + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2353..2354, + }, + ), + range: 2353..2354, }, ), - }, - Attributed { - custom: (), - node: MatchMapping( + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2356..2357, + }, + ), + range: 2356..2357, + }, + ), + MatchMapping( PatternMatchMapping { keys: [], patterns: [], rest: None, - range: 2455..2457, + range: 2359..2361, }, ), - }, - ], - range: 2388..2457, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2467..2468, - }, - ), - }, ], - value: Attributed { - custom: (), - node: Constant( + range: 2352..2362, + }, + ), + ], + rest: None, + range: 2348..2363, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2373..2374, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2377..2378, + }, + ), + type_comment: None, + range: 2373..2378, + }, + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchOr( + PatternMatchOr { + patterns: [ + MatchMapping( + PatternMatchMapping { + keys: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2389..2390, + }, + ), + ], + patterns: [ + MatchOr( + PatternMatchOr { + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2393..2394, + }, + ), + range: 2393..2394, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2396..2397, + }, + ), + range: 2396..2397, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: None, + range: 2399..2401, + }, + ), + ], + range: 2392..2402, + }, + ), + MatchSingleton( + PatternMatchSingleton { + value: Bool( + false, + ), + range: 2405..2410, + }, + ), + ], + range: 2392..2410, + }, + ), + ], + rest: None, + range: 2388..2411, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [ + Constant( ExprConstant { value: Int( 1, ), kind: None, - range: 2471..2472, + range: 2415..2416, }, ), - }, - type_comment: None, - range: 2467..2472, - }, - ), - }, - ], - range: 2383..2477, - }, - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [], - range: 2482..2484, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2494..2495, - }, - ), - }, ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 2498..2499, - }, - ), - }, - type_comment: None, - range: 2494..2499, - }, - ), - }, - ], - range: 2477..2522, - }, - ], - range: 2330..2499, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2529..2530, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 2532..2533, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 2535..2536, - }, - ), - }, - ], - ctx: Load, - range: 2528..2537, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2548..2549, + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [], + range: 2419..2421, }, ), - }, - range: 2548..2549, + ], + range: 2418..2422, }, ), - }, - Attributed { - custom: (), - node: MatchStar( - PatternMatchStar { - name: Some( - Identifier( - "x", - ), - ), - range: 2551..2553, - }, - ), - }, - ], - range: 2548..2553, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 2563..2564, - }, - ), - }, ], - value: Attributed { - custom: (), - node: Constant( + rest: None, + range: 2414..2423, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [ + Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 2567..2568, + range: 2427..2428, }, ), - }, - type_comment: None, - range: 2563..2568, - }, - ), - }, - ], - range: 2543..2591, - }, - ], - range: 2522..2568, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2598..2599, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 2601..2602, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 2604..2605, - }, - ), - }, - ], - ctx: Load, - range: 2597..2606, - }, - ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchStar( - PatternMatchStar { - name: Some( - Identifier( - "x", - ), - ), - range: 2617..2619, - }, - ), - }, - Attributed { - custom: (), - node: MatchValue( - PatternMatchValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, + ], + patterns: [ + MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2431..2432, + }, ), - kind: None, - range: 2621..2622, + range: 2431..2432, }, ), - }, - range: 2621..2622, - }, - ), - }, - ], - range: 2617..2623, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2434..2435, + }, + ), + range: 2434..2435, + }, ), - ctx: Store, - range: 2633..2634, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2637..2638, + MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: None, + range: 2437..2439, + }, + ), + ], + range: 2430..2440, }, ), - }, - type_comment: None, - range: 2633..2638, + ], + rest: None, + range: 2426..2441, }, ), + MatchSequence( + PatternMatchSequence { + patterns: [], + range: 2444..2446, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Str( + "X", + ), + kind: None, + range: 2449..2452, + }, + ), + range: 2449..2452, + }, + ), + MatchMapping( + PatternMatchMapping { + keys: [], + patterns: [], + rest: None, + range: 2455..2457, + }, + ), + ], + range: 2388..2457, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2467..2468, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2471..2472, + }, + ), + type_comment: None, + range: 2467..2472, }, - ], - range: 2612..2661, - }, - ], - range: 2591..2638, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Name( + ), + ], + range: PhantomData, + }, + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [], + range: 2482..2484, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2494..2495, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2498..2499, + }, + ), + type_comment: None, + range: 2494..2499, + }, + ), + ], + range: PhantomData, + }, + ], + range: 2330..2499, + }, + ), + Match( + StmtMatch { + subject: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2529..2530, + }, + ), + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2532..2533, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2535..2536, + }, + ), + ], + ctx: Load, + range: 2528..2537, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2548..2549, + }, + ), + range: 2548..2549, + }, + ), + MatchStar( + PatternMatchStar { + name: Some( + Identifier( + "x", + ), + ), + range: 2551..2553, + }, + ), + ], + range: 2548..2553, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2563..2564, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2567..2568, + }, + ), + type_comment: None, + range: 2563..2568, + }, + ), + ], + range: PhantomData, + }, + ], + range: 2522..2568, + }, + ), + Match( + StmtMatch { + subject: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2598..2599, + }, + ), + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2601..2602, + }, + ), + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2604..2605, + }, + ), + ], + ctx: Load, + range: 2597..2606, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchStar( + PatternMatchStar { + name: Some( + Identifier( + "x", + ), + ), + range: 2617..2619, + }, + ), + MatchValue( + PatternMatchValue { + value: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 2621..2622, + }, + ), + range: 2621..2622, + }, + ), + ], + range: 2617..2623, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 2633..2634, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2637..2638, + }, + ), + type_comment: None, + range: 2633..2638, + }, + ), + ], + range: PhantomData, + }, + ], + range: 2591..2638, + }, + ), + Match( + StmtMatch { + subject: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 2667..2668, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "y", + ), + ), + range: 2680..2681, + }, + ), + ], + range: 2680..2682, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "z", + ), + ctx: Store, + range: 2692..2693, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2696..2697, + }, + ), + type_comment: None, + range: 2692..2697, + }, + ), + ], + range: PhantomData, + }, + ], + range: 2661..2697, + }, + ), + Match( + StmtMatch { + subject: Tuple( + ExprTuple { + elts: [ + Name( + ExprName { + id: Identifier( + "w", + ), + ctx: Load, + range: 2726..2727, + }, + ), + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 2729..2730, + }, + ), + ], + ctx: Load, + range: 2720..2760, + }, + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "y", + ), + ), + range: 2741..2742, + }, + ), + MatchAs( + PatternMatchAs { + pattern: None, + name: Some( + Identifier( + "z", + ), + ), + range: 2744..2745, + }, + ), + ], + range: 2741..2745, + }, + ), + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "v", + ), + ctx: Store, + range: 2755..2756, + }, + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 2759..2760, + }, + ), + type_comment: None, + range: 2755..2760, + }, + ), + ], + range: PhantomData, + }, + ], + range: 2720..2760, + }, + ), + Match( + StmtMatch { + subject: NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "w", + ), + ctx: Store, + range: 2789..2790, + }, + ), + value: Name( ExprName { id: Identifier( "x", ), ctx: Load, - range: 2667..2668, + range: 2794..2795, }, ), + range: 2789..2795, }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchAs( + ), + cases: [ + MatchCase { + pattern: MatchSequence( + PatternMatchSequence { + patterns: [ + MatchAs( + PatternMatchAs { + pattern: Some( + MatchAs( PatternMatchAs { pattern: None, name: Some( @@ -5029,304 +3913,55 @@ expression: parse_ast "y", ), ), - range: 2680..2681, + range: 2807..2808, }, ), - }, - ], - range: 2680..2682, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Store, - range: 2692..2693, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2696..2697, - }, + ), + name: Some( + Identifier( + "v", ), - }, - type_comment: None, - range: 2692..2697, + ), + range: 2807..2813, }, ), - }, - ], - range: 2675..2720, - }, - ], - range: 2661..2697, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "w", - ), - ctx: Load, - range: 2726..2727, - }, - ), - }, - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 2729..2730, - }, - ), - }, ], - ctx: Load, - range: 2720..2760, + range: 2807..2814, }, ), - }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "y", - ), - ), - range: 2741..2742, - }, + guard: None, + body: [ + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "z", ), + ctx: Store, + range: 2824..2825, }, - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "z", - ), - ), - range: 2744..2745, - }, - ), - }, - ], - range: 2741..2745, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "v", - ), - ctx: Store, - range: 2755..2756, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2759..2760, - }, - ), - }, - type_comment: None, - range: 2755..2760, - }, - ), - }, - ], - range: 2736..2783, - }, - ], - range: 2720..2760, - }, - ), - }, - Attributed { - custom: (), - node: Match( - StmtMatch { - subject: Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "w", + ), + ], + value: Constant( + ExprConstant { + value: Int( + 0, ), - ctx: Store, - range: 2789..2790, + kind: None, + range: 2828..2829, }, ), + type_comment: None, + range: 2824..2829, }, - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 2794..2795, - }, - ), - }, - range: 2789..2795, - }, - ), + ), + ], + range: PhantomData, }, - cases: [ - MatchCase { - pattern: Attributed { - custom: (), - node: MatchSequence( - PatternMatchSequence { - patterns: [ - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: Some( - Attributed { - custom: (), - node: MatchAs( - PatternMatchAs { - pattern: None, - name: Some( - Identifier( - "y", - ), - ), - range: 2807..2808, - }, - ), - }, - ), - name: Some( - Identifier( - "v", - ), - ), - range: 2807..2813, - }, - ), - }, - ], - range: 2807..2814, - }, - ), - }, - guard: None, - body: [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "z", - ), - ctx: Store, - range: 2824..2825, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 2828..2829, - }, - ), - }, - type_comment: None, - range: 2824..2829, - }, - ), - }, - ], - range: 2802..2830, - }, - ], - range: 2783..2829, - }, - ), - }, + ], + 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 4e9aa48..576e613 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__slice.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__slice.snap @@ -2,74 +2,56 @@ source: parser/src/parser.rs expression: parse_ast --- -Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 0..1, - }, +Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "x", ), + ctx: Load, + range: 0..1, }, - slice: Attributed { - custom: (), - node: Slice( - ExprSlice { - lower: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 2..3, - }, - ), - }, - ), - upper: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 4..5, - }, - ), - }, - ), - step: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 6..7, - }, - ), - }, - ), - range: 2..7, - }, + ), + slice: Slice( + ExprSlice { + lower: Some( + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 2..3, + }, + ), ), + upper: Some( + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 4..5, + }, + ), + ), + step: Some( + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 6..7, + }, + ), + ), + range: 2..7, }, - ctx: Load, - range: 0..8, - }, - ), -} + ), + 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 0e01e67..d16caad 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap @@ -3,402 +3,291 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "array_slice", - ), - ctx: Store, - range: 0..11, - }, + Assign( + StmtAssign { + targets: [ + Name( + ExprName { + id: Identifier( + "array_slice", ), + ctx: Store, + range: 0..11, }, - ], - value: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "array", - ), - ctx: Load, - range: 14..19, - }, - ), - }, - slice: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 20..21, - }, - ), - }, - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "indexes", - ), - ctx: Load, - range: 24..31, - }, - ), - }, - ctx: Load, - range: 23..31, - }, - ), - }, - Attributed { - custom: (), - node: UnaryOp( - ExprUnaryOp { - op: USub, - operand: Attributed { - custom: (), - node: Constant( - ExprConstant { - 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, - }, - ), - }, - Attributed { - custom: (), - node: Assign( - StmtAssign { - targets: [ - Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "array", - ), - ctx: Load, - range: 37..42, - }, - ), - }, - slice: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 43..44, - }, - ), - }, - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "indexes", - ), - ctx: Load, - range: 47..54, - }, - ), - }, - ctx: Load, - range: 46..54, - }, - ), - }, - Attributed { - custom: (), - node: UnaryOp( - ExprUnaryOp { - op: USub, - operand: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 57..58, - }, - ), - }, - range: 56..58, - }, - ), - }, - ], - ctx: Load, - range: 43..58, - }, - ), - }, - ctx: Store, - range: 37..59, - }, - ), - }, - ], - value: Attributed { - custom: (), - node: Name( + ), + ], + value: Subscript( + ExprSubscript { + value: Name( ExprName { id: Identifier( - "array_slice", + "array", ), ctx: Load, - range: 62..73, + range: 14..19, }, ), - }, - type_comment: None, - range: 37..73, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "array", + slice: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 20..21, + }, + ), + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "indexes", + ), + ctx: Load, + range: 24..31, + }, ), ctx: Load, - range: 74..79, + range: 23..31, }, ), - }, - slice: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "indexes_to_select", - ), - ctx: Load, - range: 81..98, - }, - ), - }, - ctx: Load, - range: 80..98, - }, + UnaryOp( + ExprUnaryOp { + op: USub, + operand: Constant( + ExprConstant { + value: Int( + 1, ), + kind: None, + range: 34..35, }, - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "indexes_to_select", - ), - ctx: Load, - range: 101..118, - }, - ), - }, - ctx: Load, - range: 100..118, - }, - ), - }, - ], - ctx: Load, - range: 80..118, + ), + range: 33..35, }, ), - }, + ], ctx: Load, - range: 74..119, + range: 20..35, }, ), + ctx: Load, + range: 14..36, }, - range: 74..119, - }, - ), - }, - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "array", + ), + type_comment: None, + range: 0..36, + }, + ), + Assign( + StmtAssign { + targets: [ + Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "array", + ), + ctx: Load, + range: 37..42, + }, + ), + slice: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 43..44, + }, + ), + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "indexes", + ), + ctx: Load, + range: 47..54, + }, + ), + ctx: Load, + range: 46..54, + }, + ), + UnaryOp( + ExprUnaryOp { + op: USub, + operand: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 57..58, + }, + ), + range: 56..58, + }, + ), + ], + ctx: Load, + range: 43..58, + }, + ), + ctx: Store, + range: 37..59, + }, + ), + ], + value: Name( + ExprName { + id: Identifier( + "array_slice", + ), + ctx: Load, + range: 62..73, + }, + ), + type_comment: None, + range: 37..73, + }, + ), + Expr( + StmtExpr { + value: Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "array", + ), + ctx: Load, + range: 74..79, + }, + ), + slice: Tuple( + ExprTuple { + elts: [ + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "indexes_to_select", + ), + ctx: Load, + range: 81..98, + }, ), ctx: Load, - range: 120..125, + range: 80..98, }, ), - }, - slice: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Slice( - ExprSlice { - lower: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 126..127, - }, - ), - }, - ), - upper: Some( - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 5, - ), - kind: None, - range: 128..129, - }, - ), - }, - ), - step: None, - range: 126..129, - }, + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "indexes_to_select", ), + ctx: Load, + range: 101..118, }, - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "indexes_to_select", - ), - ctx: Load, - range: 132..149, - }, - ), - }, - ctx: Load, - range: 131..149, - }, - ), - }, - ], + ), ctx: Load, - range: 126..149, + range: 100..118, }, ), - }, + ], ctx: Load, - range: 120..150, + range: 80..118, }, ), + ctx: Load, + range: 74..119, }, - range: 120..150, - }, - ), - }, + ), + range: 74..119, + }, + ), + Expr( + StmtExpr { + value: Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "array", + ), + ctx: Load, + range: 120..125, + }, + ), + slice: Tuple( + ExprTuple { + elts: [ + Slice( + ExprSlice { + lower: Some( + Constant( + ExprConstant { + value: Int( + 3, + ), + kind: None, + range: 126..127, + }, + ), + ), + upper: Some( + Constant( + ExprConstant { + value: Int( + 5, + ), + kind: None, + range: 128..129, + }, + ), + ), + step: None, + range: 126..129, + }, + ), + Starred( + ExprStarred { + value: Name( + ExprName { + 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 5906bce..d515022 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__try.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__try.snap @@ -3,322 +3,241 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Try( - StmtTry { - body: [ - Attributed { - custom: (), - node: Raise( - StmtRaise { - exc: Some( - Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "ValueError", + Try( + StmtTry { + body: [ + Raise( + StmtRaise { + exc: Some( + Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "ValueError", + ), + ctx: Load, + range: 15..25, + }, + ), + args: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 26..27, + }, + ), + ], + keywords: [], + range: 15..28, + }, + ), + ), + cause: None, + range: 9..28, + }, + ), + ], + handlers: [ + ExceptHandler( + ExcepthandlerExceptHandler { + type_: Some( + Name( + ExprName { + id: Identifier( + "TypeError", + ), + ctx: Load, + range: 36..45, + }, + ), + ), + name: Some( + Identifier( + "e", + ), + ), + body: [ + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 56..61, + }, + ), + args: [ + JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "caught ", + ), + kind: None, + range: 62..81, + }, ), - ctx: Load, - range: 15..25, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 26..27, - }, - ), + FormattedValue( + ExprFormattedValue { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "type", + ), + ctx: Load, + range: 72..76, + }, + ), + args: [ + Name( + ExprName { + 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: 15..28, - }, - ), - }, - ), - cause: None, - range: 9..28, - }, - ), - }, - ], - handlers: [ - Attributed { - custom: (), - node: ExceptHandler( - ExcepthandlerExceptHandler { - type_: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "TypeError", ), - ctx: Load, - range: 36..45, - }, - ), - }, - ), - name: Some( - Identifier( - "e", + ], + keywords: [], + range: 56..82, + }, ), - ), - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "print", - ), - ctx: Load, - range: 56..61, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "caught ", - ), - kind: None, - range: 62..81, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "type", - ), - ctx: Load, - range: 72..76, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "e", - ), - ctx: Load, - range: 77..78, - }, - ), - }, - ], - keywords: [], - range: 72..79, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 62..81, - }, + range: 56..82, + }, + ), + ], + range: 29..82, + }, + ), + ExceptHandler( + ExcepthandlerExceptHandler { + type_: Some( + Name( + ExprName { + id: Identifier( + "OSError", + ), + ctx: Load, + range: 90..97, + }, + ), + ), + name: Some( + Identifier( + "e", + ), + ), + body: [ + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 108..113, + }, + ), + args: [ + JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "caught ", + ), + kind: None, + range: 114..133, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "type", ), + ctx: Load, + range: 124..128, }, + ), + args: [ + Name( + ExprName { + id: Identifier( + "e", + ), + ctx: Load, + range: 129..130, + }, + ), ], - range: 62..81, + keywords: [], + range: 124..131, }, ), - }, - ], - keywords: [], - range: 56..82, - }, - ), - }, - range: 56..82, - }, - ), - }, - ], - range: 29..82, - }, - ), - }, - Attributed { - custom: (), - node: ExceptHandler( - ExcepthandlerExceptHandler { - type_: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "OSError", - ), - ctx: Load, - range: 90..97, - }, - ), - }, - ), - name: Some( - Identifier( - "e", - ), - ), - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "print", - ), - ctx: Load, - range: 108..113, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "caught ", - ), - kind: None, - range: 114..133, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "type", - ), - ctx: Load, - range: 124..128, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "e", - ), - ctx: Load, - range: 129..130, - }, - ), - }, - ], - keywords: [], - range: 124..131, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 114..133, - }, - ), - }, - ], - range: 114..133, - }, + conversion: Int( + 0, ), + format_spec: None, + range: 114..133, }, - ], - keywords: [], - range: 108..134, - }, - ), - }, - range: 108..134, - }, - ), - }, - ], - range: 83..134, - }, - ), + ), + ], + range: 114..133, + }, + ), + ], + keywords: [], + range: 108..134, + }, + ), + range: 108..134, + }, + ), + ], + range: 83..134, }, - ], - orelse: [], - finalbody: [], - range: 0..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 2b4ce41..91192fa 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__try_star.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__try_star.snap @@ -3,569 +3,425 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: TryStar( - StmtTryStar { - body: [ - Attributed { - custom: (), - node: Raise( - StmtRaise { - exc: Some( - Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "ExceptionGroup", + TryStar( + StmtTryStar { + body: [ + Raise( + StmtRaise { + exc: Some( + Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "ExceptionGroup", + ), + ctx: Load, + range: 15..29, + }, + ), + args: [ + Constant( + ExprConstant { + value: Str( + "eg", + ), + kind: None, + range: 30..34, + }, + ), + List( + ExprList { + elts: [ + Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "ValueError", + ), + ctx: Load, + range: 45..55, + }, ), - ctx: Load, - range: 15..29, + args: [ + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 56..57, + }, + ), + ], + keywords: [], + range: 45..58, }, ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "eg", + Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "TypeError", + ), + ctx: Load, + range: 60..69, + }, + ), + args: [ + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 70..71, + }, ), - kind: None, - range: 30..34, - }, - ), - }, - Attributed { - custom: (), - node: List( - ExprList { - elts: [ - Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "ValueError", - ), - ctx: Load, - range: 45..55, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 56..57, - }, - ), - }, - ], - keywords: [], - range: 45..58, - }, + ], + keywords: [], + range: 60..72, + }, + ), + Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "OSError", + ), + ctx: Load, + range: 74..81, + }, + ), + args: [ + Constant( + ExprConstant { + value: Int( + 3, ), + kind: None, + range: 82..83, }, - Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "TypeError", - ), - ctx: Load, - range: 60..69, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 70..71, - }, - ), - }, - ], - keywords: [], - range: 60..72, - }, + ), + ], + keywords: [], + range: 74..84, + }, + ), + Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "OSError", + ), + ctx: Load, + range: 86..93, + }, + ), + args: [ + Constant( + ExprConstant { + value: Int( + 4, ), + kind: None, + range: 94..95, }, - Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "OSError", - ), - ctx: Load, - range: 74..81, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 3, - ), - kind: None, - range: 82..83, - }, - ), - }, - ], - keywords: [], - range: 74..84, - }, - ), - }, - Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "OSError", - ), - ctx: Load, - range: 86..93, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 4, - ), - kind: None, - range: 94..95, - }, - ), - }, - ], - keywords: [], - range: 86..96, - }, - ), - }, - ], - ctx: Load, - range: 44..97, - }, - ), - }, + ), + ], + keywords: [], + range: 86..96, + }, + ), ], - keywords: [], - range: 15..98, - }, - ), - }, - ), - cause: None, - range: 9..98, - }, - ), - }, - ], - handlers: [ - Attributed { - custom: (), - node: ExceptHandler( - ExcepthandlerExceptHandler { - type_: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "TypeError", - ), ctx: Load, - range: 107..116, + range: 44..97, }, ), - }, - ), - name: Some( - Identifier( - "e", + ], + keywords: [], + range: 15..98, + }, + ), + ), + cause: None, + range: 9..98, + }, + ), + ], + handlers: [ + ExceptHandler( + ExcepthandlerExceptHandler { + type_: Some( + Name( + ExprName { + id: Identifier( + "TypeError", ), - ), - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "print", - ), - ctx: Load, - range: 127..132, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "caught ", - ), - kind: None, - range: 133..179, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "type", - ), - ctx: Load, - range: 143..147, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "e", - ), - ctx: Load, - range: 148..149, - }, - ), - }, - ], - keywords: [], - range: 143..150, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 133..179, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - " with nested ", - ), - kind: None, - range: 133..179, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Name( - ExprName { - 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, - }, + ctx: Load, + range: 107..116, + }, + ), + ), + name: Some( + Identifier( + "e", + ), + ), + body: [ + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 127..132, + }, + ), + args: [ + JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "caught ", + ), + kind: None, + range: 133..179, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "type", ), + ctx: Load, + range: 143..147, }, + ), + args: [ + Name( + ExprName { + id: Identifier( + "e", + ), + ctx: Load, + range: 148..149, + }, + ), ], - range: 133..179, + keywords: [], + range: 143..150, }, ), + conversion: Int( + 0, + ), + format_spec: None, + range: 133..179, }, - ], - keywords: [], - range: 127..180, - }, - ), - }, - range: 127..180, - }, - ), - }, - ], - range: 99..180, - }, - ), - }, - Attributed { - custom: (), - node: ExceptHandler( - ExcepthandlerExceptHandler { - type_: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "OSError", - ), - ctx: Load, - range: 189..196, - }, - ), - }, - ), - name: Some( - Identifier( - "e", - ), - ), - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "print", - ), - ctx: Load, - range: 207..212, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "caught ", - ), - kind: None, - range: 213..259, - }, + ), + Constant( + ExprConstant { + value: Str( + " with nested ", + ), + kind: None, + range: 133..179, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Attribute( + ExprAttribute { + value: Name( + ExprName { + id: Identifier( + "e", ), + ctx: Load, + range: 165..166, }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Call( - ExprCall { - func: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "type", - ), - ctx: Load, - range: 223..227, - }, - ), - }, - args: [ - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "e", - ), - ctx: Load, - range: 228..229, - }, - ), - }, - ], - keywords: [], - range: 223..230, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 213..259, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - " with nested ", - ), - kind: None, - range: 213..259, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Attribute( - ExprAttribute { - value: Attributed { - custom: (), - node: Name( - ExprName { - 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, + ), + attr: Identifier( + "exceptions", + ), + ctx: Load, + range: 165..177, }, ), + conversion: Int( + 0, + ), + format_spec: None, + range: 133..179, }, - ], - keywords: [], - range: 207..260, - }, - ), - }, - range: 207..260, - }, - ), - }, - ], - range: 181..260, - }, - ), + ), + ], + range: 133..179, + }, + ), + ], + keywords: [], + range: 127..180, + }, + ), + range: 127..180, + }, + ), + ], + range: 99..180, }, - ], - orelse: [], - finalbody: [], - range: 0..260, - }, - ), - }, + ), + ExceptHandler( + ExcepthandlerExceptHandler { + type_: Some( + Name( + ExprName { + id: Identifier( + "OSError", + ), + ctx: Load, + range: 189..196, + }, + ), + ), + name: Some( + Identifier( + "e", + ), + ), + body: [ + Expr( + StmtExpr { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "print", + ), + ctx: Load, + range: 207..212, + }, + ), + args: [ + JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "caught ", + ), + kind: None, + range: 213..259, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Call( + ExprCall { + func: Name( + ExprName { + id: Identifier( + "type", + ), + ctx: Load, + range: 223..227, + }, + ), + args: [ + Name( + ExprName { + id: Identifier( + "e", + ), + ctx: Load, + range: 228..229, + }, + ), + ], + keywords: [], + range: 223..230, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 213..259, + }, + ), + Constant( + ExprConstant { + value: Str( + " with nested ", + ), + kind: None, + range: 213..259, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Attribute( + ExprAttribute { + value: Name( + ExprName { + 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 1d166b2..147e06a 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap @@ -3,125 +3,95 @@ source: parser/src/parser.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: FunctionDef( - StmtFunctionDef { - name: Identifier( - "args_to_tuple", - ), - args: Arguments { - posonlyargs: [], - args: [], - vararg: Some( - Attributed { - custom: (), - node: ArgData { - arg: Identifier( - "args", - ), - annotation: Some( - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "Ts", - ), - ctx: Load, - range: 27..29, - }, - ), - }, - ctx: Load, - range: 26..29, - }, - ), - }, - ), - type_comment: None, - range: 20..29, - }, - }, - ), - kwonlyargs: [], - kw_defaults: [], - kwarg: None, - defaults: [], - range: 19..29, - }, - body: [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Ellipsis, - kind: None, - range: 46..49, + FunctionDef( + StmtFunctionDef { + name: Identifier( + "args_to_tuple", + ), + args: Arguments { + posonlyargs: [], + args: [], + vararg: Some( + Arg { + arg: Identifier( + "args", + ), + annotation: Some( + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "Ts", + ), + ctx: Load, + range: 27..29, }, ), + ctx: Load, + range: 26..29, }, + ), + ), + type_comment: None, + range: 20..29, + }, + ), + kwonlyargs: [], + kw_defaults: [], + kwarg: None, + defaults: [], + range: PhantomData, + }, + body: [ + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Ellipsis, + kind: None, range: 46..49, }, ), - }, - ], - decorator_list: [], - returns: Some( - Attributed { - custom: (), - node: Subscript( - ExprSubscript { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "Tuple", - ), - ctx: Load, - range: 34..39, - }, - ), - }, - slice: Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "Ts", - ), - ctx: Load, - range: 41..43, - }, - ), - }, - ctx: Load, - range: 40..43, - }, - ), - }, - ctx: Load, - range: 34..44, - }, - ), + range: 46..49, }, ), - type_comment: None, - range: 1..49, - }, - ), - }, + ], + decorator_list: [], + returns: Some( + Subscript( + ExprSubscript { + value: Name( + ExprName { + id: Identifier( + "Tuple", + ), + ctx: Load, + range: 34..39, + }, + ), + slice: Starred( + ExprStarred { + value: Name( + ExprName { + 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 06ee49c..6cf9962 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__with_statement.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__with_statement.snap @@ -3,1644 +3,1236 @@ source: parser/src/parser.rs expression: "parse_program(source, \"\").unwrap()" --- [ - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 5..6, - }, + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, ), + kind: None, + range: 5..6, }, - optional_vars: None, - range: 5..6, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 8..12, }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 8..12, - }, - ), - }, - ], - type_comment: None, - range: 0..12, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 18..19, - }, + ), + ], + type_comment: None, + range: 0..12, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, ), + kind: None, + range: 18..19, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 23..24, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 23..24, }, ), - range: 18..24, + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 26..30, }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 26..30, - }, - ), - }, - ], - type_comment: None, - range: 13..30, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 36..37, - }, + ), + ], + type_comment: None, + range: 13..30, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, ), + kind: None, + range: 36..37, }, - optional_vars: None, - range: 36..37, + ), + optional_vars: None, + range: PhantomData, + }, + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 39..40, + }, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 42..46, }, - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( + ), + ], + type_comment: None, + range: 31..46, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 52..53, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 57..58, + }, + ), + ), + range: PhantomData, + }, + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 60..61, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "y", + ), + ctx: Store, + range: 65..66, + }, + ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 68..72, + }, + ), + ], + type_comment: None, + range: 47..72, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: IfExp( + ExprIfExp { + test: Constant( ExprConstant { value: Int( 1, ), kind: None, - range: 39..40, + range: 83..84, }, ), - }, - optional_vars: None, - range: 39..40, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 42..46, - }, - ), - }, - ], - type_comment: None, - range: 31..46, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( + body: Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 52..53, + range: 78..79, }, ), + orelse: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 90..91, + }, + ), + range: 78..91, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 57..58, - }, - ), - }, - ), - range: 52..58, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 93..97, }, - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( + ), + ], + type_comment: None, + range: 73..97, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: IfExp( + ExprIfExp { + test: Constant( ExprConstant { value: Int( 1, ), kind: None, - range: 60..61, + range: 108..109, }, ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "y", - ), - ctx: Store, - range: 65..66, - }, - ), - }, - ), - range: 60..66, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 68..72, - }, - ), - }, - ], - type_comment: None, - range: 47..72, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: IfExp( - ExprIfExp { - test: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 83..84, - }, - ), - }, - body: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 78..79, - }, - ), - }, - orelse: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 90..91, - }, - ), - }, - range: 78..91, - }, - ), - }, - optional_vars: None, - range: 78..91, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 93..97, - }, - ), - }, - ], - type_comment: None, - range: 73..97, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: IfExp( - ExprIfExp { - test: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 108..109, - }, - ), - }, - body: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 103..104, - }, - ), - }, - orelse: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 115..116, - }, - ), - }, - range: 103..116, - }, - ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 120..121, - }, - ), - }, - ), - range: 103..121, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 123..127, - }, - ), - }, - ], - type_comment: None, - range: 98..127, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [], - ctx: Load, - range: 133..135, - }, - ), - }, - optional_vars: None, - range: 133..135, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 137..141, - }, - ), - }, - ], - type_comment: None, - range: 128..141, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [], - ctx: Load, - range: 147..149, - }, - ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 153..154, - }, - ), - }, - ), - range: 147..154, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 156..160, - }, - ), - }, - ], - type_comment: None, - range: 142..160, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( + body: Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 167..168, + range: 103..104, }, ), + orelse: Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 115..116, + }, + ), + range: 103..116, }, - optional_vars: None, - range: 167..168, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 171..175, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 120..121, }, ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 123..127, }, - ], - type_comment: None, - range: 161..175, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( + ), + ], + type_comment: None, + range: 98..127, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [], + ctx: Load, + range: 133..135, + }, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 137..141, + }, + ), + ], + type_comment: None, + range: 128..141, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [], + ctx: Load, + range: 147..149, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 153..154, + }, + ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 156..160, + }, + ), + ], + type_comment: None, + range: 142..160, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 167..168, + }, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 171..175, + }, + ), + ], + type_comment: None, + range: 161..175, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 182..183, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 188..189, + }, + ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 191..195, + }, + ), + ], + type_comment: None, + range: 176..195, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 202..203, + }, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 207..211, + }, + ), + ], + type_comment: None, + range: 196..211, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 218..219, + }, + ), + ], + ctx: Load, + range: 217..221, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 225..226, + }, + ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 228..232, + }, + ), + ], + type_comment: None, + range: 212..232, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 239..240, + }, + ), + optional_vars: None, + range: PhantomData, + }, + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 242..243, + }, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 246..250, + }, + ), + ], + type_comment: None, + range: 233..250, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 257..258, + }, + ), + Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 260..261, + }, + ), + ], + ctx: Load, + range: 256..262, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 266..267, + }, + ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 269..273, + }, + ), + ], + type_comment: None, + range: 251..273, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [ + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 281..282, + }, + ), + ctx: Load, + range: 280..282, + }, + ), + ], + ctx: Load, + range: 279..284, + }, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 286..290, + }, + ), + ], + type_comment: None, + range: 274..290, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [ + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 298..299, + }, + ), + ctx: Load, + range: 297..299, + }, + ), + ], + ctx: Load, + range: 296..301, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 305..306, + }, + ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 308..312, + }, + ), + ], + type_comment: None, + range: 291..312, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 319..320, + }, + ), + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 323..324, + }, + ), + ctx: Load, + range: 322..324, + }, + ), + ], + ctx: Load, + range: 318..325, + }, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 327..331, + }, + ), + ], + type_comment: None, + range: 313..331, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [ + Constant( + ExprConstant { + value: Int( + 0, + ), + kind: None, + range: 338..339, + }, + ), + Starred( + ExprStarred { + value: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Load, + range: 342..343, + }, + ), + ctx: Load, + range: 341..343, + }, + ), + ], + ctx: Load, + range: 337..344, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Store, + range: 348..349, + }, + ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 351..355, + }, + ), + ], + type_comment: None, + range: 332..355, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Store, + range: 362..363, + }, + ), + value: Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 182..183, + range: 367..368, }, ), + range: 362..368, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 188..189, - }, - ), - }, - ), - range: 181..189, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 371..375, }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 191..195, - }, - ), - }, - ], - type_comment: None, - range: 176..195, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( + ), + ], + type_comment: None, + range: 356..375, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "a", + ), + ctx: Store, + range: 382..383, + }, + ), + value: Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 202..203, + range: 387..388, }, ), + range: 382..388, }, - optional_vars: None, - range: 202..203, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 207..211, - }, - ), - }, - ], - type_comment: None, - range: 196..211, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 218..219, - }, - ), - }, - ], - ctx: Load, - range: 217..221, - }, - ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 225..226, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 393..394, }, ), - range: 217..226, + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 396..400, }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 228..232, - }, - ), - }, - ], - type_comment: None, - range: 212..232, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 239..240, - }, - ), - }, - optional_vars: None, - range: 239..243, - }, - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 242..243, - }, - ), - }, - optional_vars: None, - range: 239..243, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 246..250, - }, - ), - }, - ], - type_comment: None, - range: 233..250, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 257..258, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 260..261, - }, - ), - }, - ], - ctx: Load, - range: 256..262, - }, - ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 266..267, - }, - ), - }, - ), - range: 256..267, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 269..273, - }, - ), - }, - ], - type_comment: None, - range: 251..273, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 281..282, - }, - ), - }, - ctx: Load, - range: 280..282, - }, - ), - }, - ], - ctx: Load, - range: 279..284, - }, - ), - }, - optional_vars: None, - range: 279..284, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 286..290, - }, - ), - }, - ], - type_comment: None, - range: 274..290, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 298..299, - }, - ), - }, - ctx: Load, - range: 297..299, - }, - ), - }, - ], - ctx: Load, - range: 296..301, - }, - ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 305..306, - }, - ), - }, - ), - range: 296..306, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 308..312, - }, - ), - }, - ], - type_comment: None, - range: 291..312, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 319..320, - }, - ), - }, - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 323..324, - }, - ), - }, - ctx: Load, - range: 322..324, - }, - ), - }, - ], - ctx: Load, - range: 318..325, - }, - ), - }, - optional_vars: None, - range: 318..325, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 327..331, - }, - ), - }, - ], - type_comment: None, - range: 313..331, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 338..339, - }, - ), - }, - Attributed { - custom: (), - node: Starred( - ExprStarred { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 342..343, - }, - ), - }, - ctx: Load, - range: 341..343, - }, - ), - }, - ], - ctx: Load, - range: 337..344, - }, - ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 348..349, - }, - ), - }, - ), - range: 337..349, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 351..355, - }, - ), - }, - ], - type_comment: None, - range: 332..355, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( + ), + ], + type_comment: None, + range: 376..400, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [ + NamedExpr( + ExprNamedExpr { + target: Name( ExprName { id: Identifier( "a", ), ctx: Store, - range: 362..363, + range: 407..408, }, ), - }, - value: Attributed { - custom: (), - node: Constant( + value: Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 367..368, + range: 412..413, }, ), + range: 407..413, }, - range: 362..368, - }, - ), + ), + NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Store, + range: 415..416, + }, + ), + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 420..421, + }, + ), + range: 415..421, + }, + ), + ], + ctx: Load, + range: 406..422, }, - optional_vars: None, - range: 361..369, + ), + optional_vars: None, + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 424..428, }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 371..375, - }, - ), - }, - ], - type_comment: None, - range: 356..375, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( + ), + ], + type_comment: None, + range: 401..428, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Tuple( + ExprTuple { + elts: [ + NamedExpr( + ExprNamedExpr { + target: Name( ExprName { id: Identifier( "a", ), ctx: Store, - range: 382..383, + range: 435..436, }, ), - }, - value: Attributed { - custom: (), - node: Constant( + value: Constant( ExprConstant { value: Int( 0, ), kind: None, - range: 387..388, + range: 440..441, }, ), - }, - range: 382..388, - }, - ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Store, - range: 393..394, + range: 435..441, }, ), - }, - ), - range: 381..394, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 396..400, - }, - ), - }, - ], - type_comment: None, - range: 376..400, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Store, - range: 407..408, - }, - ), - }, - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 412..413, - }, - ), - }, - range: 407..413, - }, - ), - }, - Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Store, - range: 415..416, - }, - ), - }, - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 420..421, - }, - ), - }, - range: 415..421, - }, - ), - }, - ], - ctx: Load, - range: 406..422, - }, - ), - }, - optional_vars: None, - range: 406..422, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 424..428, - }, - ), - }, - ], - type_comment: None, - range: 401..428, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Tuple( - ExprTuple { - elts: [ - Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Store, - range: 435..436, - }, - ), - }, - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 440..441, - }, - ), - }, - range: 435..441, - }, - ), - }, - Attributed { - custom: (), - node: NamedExpr( - ExprNamedExpr { - target: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Store, - range: 443..444, - }, - ), - }, - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 448..449, - }, - ), - }, - range: 443..449, - }, - ), - }, - ], - ctx: Load, - range: 434..450, - }, - ), - }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", + NamedExpr( + ExprNamedExpr { + target: Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Store, + range: 443..444, + }, ), - ctx: Store, - range: 454..455, + value: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 448..449, + }, + ), + range: 443..449, }, ), - }, - ), - range: 434..455, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 457..461, - }, - ), - }, - ], - type_comment: None, - range: 429..461, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 468..469, - }, - ), + ], + ctx: Load, + range: 434..450, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Store, - range: 473..474, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "x", ), + ctx: Store, + range: 454..455, }, ), - range: 468..474, + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 457..461, }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 477..481, - }, - ), - }, - ], - type_comment: None, - range: 462..481, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 488..489, - }, + ), + ], + type_comment: None, + range: 429..461, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, ), + kind: None, + range: 468..469, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Store, - range: 493..494, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "a", ), + ctx: Store, + range: 473..474, }, ), - range: 488..494, + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 477..481, }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 498..502, - }, - ), - }, - ], - type_comment: None, - range: 482..502, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 509..510, - }, + ), + ], + type_comment: None, + range: 462..481, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, ), + kind: None, + range: 488..489, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Store, - range: 514..515, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "a", ), + ctx: Store, + range: 493..494, }, ), - range: 509..515, + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 498..502, }, - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 517..518, - }, + ), + ], + type_comment: None, + range: 482..502, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, ), + kind: None, + range: 509..510, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Store, - range: 522..523, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "a", ), + ctx: Store, + range: 514..515, }, ), - range: 517..523, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 526..530, - }, - ), - }, - ], - type_comment: None, - range: 503..530, - }, - ), - }, - Attributed { - custom: (), - node: With( - StmtWith { - items: [ - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 0, - ), - kind: None, - range: 537..538, - }, + ), + range: PhantomData, + }, + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 1, ), + kind: None, + range: 517..518, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Store, - range: 542..543, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "b", ), + ctx: Store, + range: 522..523, }, ), - range: 537..543, + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 526..530, }, - Withitem { - context_expr: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 545..546, - }, + ), + ], + type_comment: None, + range: 503..530, + }, + ), + With( + StmtWith { + items: [ + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 0, ), + kind: None, + range: 537..538, }, - optional_vars: Some( - Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Store, - range: 550..551, - }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "a", ), + ctx: Store, + range: 542..543, }, ), - range: 545..551, - }, - ], - body: [ - Attributed { - custom: (), - node: Pass( - StmtPass { - range: 555..559, + ), + range: PhantomData, + }, + Withitem { + context_expr: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 545..546, + }, + ), + optional_vars: Some( + Name( + ExprName { + id: Identifier( + "b", + ), + ctx: Store, + range: 550..551, }, ), + ), + range: PhantomData, + }, + ], + body: [ + Pass( + StmtPass { + range: 555..559, }, - ], - type_comment: None, - range: 531..559, - }, - ), - }, + ), + ], + 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 b53064a..8aedf2b 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__backspace_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__backspace_alias.snap @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\u{8}", - ), - kind: None, - range: 0..15, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "\u{8}", ), + kind: None, + range: 0..15, }, - 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 146ad54..cf999bb 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__bell_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__bell_alias.snap @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\u{7}", - ), - kind: None, - range: 0..9, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "\u{7}", ), + kind: None, + range: 0..9, }, - 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 ebc94a7..d222b08 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 @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\r", - ), - kind: None, - range: 0..21, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "\r", ), + kind: None, + range: 0..21, }, - 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 6a62436..4e397d7 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 @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\u{89}", - ), - kind: None, - range: 0..45, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "\u{89}", ), + kind: None, + range: 0..45, }, - 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 3e1097f..630ee19 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__delete_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__delete_alias.snap @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\u{7f}", - ), - kind: None, - range: 0..12, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "\u{7f}", ), + kind: None, + range: 0..12, }, - 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 2a2ce24..259901d 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 @@ -3,281 +3,275 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Bytes( - [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, - 48, - 49, - 50, - 51, - 52, - 53, - 54, - 55, - 56, - 57, - 58, - 59, - 60, - 61, - 62, - 63, - 64, - 65, - 66, - 67, - 68, - 69, - 70, - 71, - 72, - 73, - 74, - 75, - 76, - 77, - 78, - 79, - 80, - 81, - 82, - 83, - 84, - 85, - 86, - 87, - 88, - 89, - 90, - 91, - 92, - 93, - 94, - 95, - 96, - 97, - 98, - 99, - 100, - 101, - 102, - 103, - 104, - 105, - 106, - 107, - 108, - 109, - 110, - 111, - 112, - 113, - 114, - 115, - 116, - 117, - 118, - 119, - 120, - 121, - 122, - 123, - 124, - 125, - 126, - 127, - 128, - 129, - 130, - 131, - 132, - 133, - 134, - 135, - 136, - 137, - 138, - 139, - 140, - 141, - 142, - 143, - 144, - 145, - 146, - 147, - 148, - 149, - 150, - 151, - 152, - 153, - 154, - 155, - 156, - 157, - 158, - 159, - 160, - 161, - 162, - 163, - 164, - 165, - 166, - 167, - 168, - 169, - 170, - 171, - 172, - 173, - 174, - 175, - 176, - 177, - 178, - 179, - 180, - 181, - 182, - 183, - 184, - 185, - 186, - 187, - 188, - 189, - 190, - 191, - 192, - 193, - 194, - 195, - 196, - 197, - 198, - 199, - 200, - 201, - 202, - 203, - 204, - 205, - 206, - 207, - 208, - 209, - 210, - 211, - 212, - 213, - 214, - 215, - 216, - 217, - 218, - 219, - 220, - 221, - 222, - 223, - 224, - 225, - 226, - 227, - 228, - 229, - 230, - 231, - 232, - 233, - 234, - 235, - 236, - 237, - 238, - 239, - 240, - 241, - 242, - 243, - 244, - 245, - 246, - 247, - 248, - 249, - 250, - 251, - 252, - 253, - 254, - 255, - ], - ), - kind: None, - range: 0..738, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Bytes( + [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 126, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + 162, + 163, + 164, + 165, + 166, + 167, + 168, + 169, + 170, + 171, + 172, + 173, + 174, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, + 183, + 184, + 185, + 186, + 187, + 188, + 189, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 199, + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 209, + 210, + 211, + 212, + 213, + 214, + 215, + 216, + 217, + 218, + 219, + 220, + 221, + 222, + 223, + 224, + 225, + 226, + 227, + 228, + 229, + 230, + 231, + 232, + 233, + 234, + 235, + 236, + 237, + 238, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 249, + 250, + 251, + 252, + 253, + 254, + 255, + ], ), + kind: None, + range: 0..738, }, - 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 c1aa770..a412117 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__escape_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__escape_alias.snap @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\u{1b}", - ), - kind: None, - range: 0..12, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "\u{1b}", ), + kind: None, + range: 0..12, }, - 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 57e108c..ad2256f 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 @@ -3,35 +3,29 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Bytes( - [ - 111, - 109, - 107, - 109, - 111, - 107, - 92, - 88, - 97, - 97, - ], - ), - kind: None, - range: 0..13, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Bytes( + [ + 111, + 109, + 107, + 109, + 111, + 107, + 92, + 88, + 97, + 97, + ], ), + kind: None, + range: 0..13, }, - 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 465c290..f781a0e 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__escape_octet.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__escape_octet.snap @@ -3,30 +3,24 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Bytes( - [ - 35, - 97, - 4, - 83, - 52, - ], - ), - kind: None, - range: 0..14, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Bytes( + [ + 35, + 97, + 4, + 83, + 52, + ], ), + kind: None, + range: 0..14, }, - 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 3d46b31..1370eee 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 @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\u{c}", - ), - kind: None, - range: 0..15, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "\u{c}", ), + kind: None, + range: 0..15, }, - 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 5ab9bce..3aec4ad 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 @@ -3,58 +3,43 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\\", - ), - kind: None, - range: 0..8, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 5..6, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..8, - }, - ), - }, - ], - range: 0..8, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "\\", + ), + kind: None, + range: 0..8, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 5..6, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..8, + }, + ), + ], + 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 b431ec6..ad0c4e4 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 @@ -3,58 +3,43 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\n", - ), - kind: None, - range: 0..8, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 5..6, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..8, - }, - ), - }, - ], - range: 0..8, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "\n", + ), + kind: None, + range: 0..8, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 5..6, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..8, + }, + ), + ], + 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 a193b29..0017e39 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 @@ -3,58 +3,43 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\\\n", - ), - kind: None, - range: 0..9, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 6..7, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..9, - }, - ), - }, - ], - range: 0..9, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "\\\n", + ), + kind: None, + range: 0..9, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 6..7, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..9, + }, + ), + ], + 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 80cbb0b..9cb96fa 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 @@ -3,52 +3,40 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "user=", - ), - kind: None, - range: 0..10, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "", - ), - kind: None, - range: 0..10, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "user", - ), - ctx: Load, - range: 3..7, - }, + Constant( + ExprConstant { + value: Str( + "user=", + ), + kind: None, + range: 0..10, + }, + ), + Constant( + ExprConstant { + value: Str( + "", + ), + kind: None, + range: 0..10, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "user", ), + ctx: Load, + range: 3..7, }, - conversion: Int( - 114, - ), - format_spec: None, - range: 0..10, - }, - ), - }, + ), + 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 97a8316..1a00128 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 @@ -3,124 +3,94 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "mix ", - ), - kind: None, - range: 0..38, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "user=", - ), - kind: None, - range: 0..38, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "", - ), - kind: None, - range: 0..38, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "user", - ), - ctx: Load, - range: 7..11, - }, + Constant( + ExprConstant { + value: Str( + "mix ", + ), + kind: None, + range: 0..38, + }, + ), + Constant( + ExprConstant { + value: Str( + "user=", + ), + kind: None, + range: 0..38, + }, + ), + Constant( + ExprConstant { + value: Str( + "", + ), + kind: None, + range: 0..38, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "user", ), + ctx: Load, + range: 7..11, }, - conversion: Int( - 114, - ), - format_spec: None, - range: 0..38, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - " with text and ", - ), - kind: None, - range: 0..38, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "second=", - ), - kind: None, - range: 0..38, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "", - ), - kind: None, - range: 0..38, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "second", - ), - ctx: Load, - range: 29..35, - }, + ), + conversion: Int( + 114, + ), + format_spec: None, + range: 0..38, + }, + ), + Constant( + ExprConstant { + value: Str( + " with text and ", + ), + kind: None, + range: 0..38, + }, + ), + Constant( + ExprConstant { + value: Str( + "second=", + ), + kind: None, + range: 0..38, + }, + ), + Constant( + ExprConstant { + value: Str( + "", + ), + kind: None, + range: 0..38, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "second", ), + ctx: Load, + range: 29..35, }, - conversion: Int( - 114, - ), - format_spec: None, - range: 0..38, - }, - ), - }, + ), + 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 0e5a979..ec9a7e9 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 @@ -3,75 +3,57 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "user=", - ), - kind: None, - range: 0..14, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "", - ), - kind: None, - range: 0..14, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "user", - ), - ctx: Load, - range: 3..7, - }, + Constant( + ExprConstant { + value: Str( + "user=", + ), + kind: None, + range: 0..14, + }, + ), + Constant( + ExprConstant { + value: Str( + "", + ), + kind: None, + range: 0..14, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "user", ), + ctx: Load, + range: 3..7, }, - conversion: Int( - 0, - ), - format_spec: Some( - Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - ">10", - ), - kind: None, - range: 0..14, - }, - ), - }, - ], - range: 0..14, - }, - ), + ), + conversion: Int( + 0, + ), + format_spec: Some( + JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + ">10", + ), + kind: None, + range: 0..14, + }, + ), + ], + 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 b272755..63e48da 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 @@ -3,58 +3,43 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\n", - ), - kind: None, - range: 0..11, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 6..7, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..11, - }, - ), - }, - ], - range: 0..11, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "\n", + ), + kind: None, + range: 0..11, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 6..7, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..11, + }, + ), + ], + 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 7f90b2b..d3dbd24 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__hts_alias.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__hts_alias.snap @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "\u{88}", - ), - kind: None, - range: 0..9, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "\u{88}", ), + kind: None, + range: 0..9, }, - 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 b17d040..4c8c280 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 @@ -3,34 +3,25 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 0..17, - }, - ), - }, - ], - range: 0..17, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "Hello world", + ), + kind: None, + range: 0..17, + }, + ), + ], + 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 b17d040..4c8c280 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 @@ -3,34 +3,25 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 0..17, - }, - ), - }, - ], - range: 0..17, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "Hello world", + ), + kind: None, + range: 0..17, + }, + ), + ], + 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 22ef95a..21dca5f 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 @@ -3,58 +3,43 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 0..22, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "!", - ), - kind: None, - range: 17..20, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 9..22, - }, - ), - }, - ], - range: 0..22, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "Hello world", + ), + kind: None, + range: 0..22, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Constant( + ExprConstant { + value: Str( + "!", + ), + kind: None, + range: 17..20, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 9..22, + }, + ), + ], + range: 0..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 02423dd..61c2181 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring.snap @@ -3,64 +3,49 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "a", - ), - ctx: Load, - range: 3..4, - }, + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "a", ), + ctx: Load, + range: 3..4, }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..18, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "b", - ), - ctx: Load, - range: 7..8, - }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..18, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "b", ), + ctx: Load, + range: 7..8, }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..18, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "{foo}", - ), - kind: None, - range: 0..18, - }, - ), - }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..18, + }, + ), + Constant( + ExprConstant { + 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 8ef0eaf..d7661bf 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 @@ -3,53 +3,41 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Compare( - ExprCompare { - left: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 42, - ), - kind: None, - range: 3..5, - }, - ), - }, - ops: [ - Eq, - ], - comparators: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 42, - ), - kind: None, - range: 9..11, - }, - ), - }, - ], - range: 3..11, + FormattedValue( + ExprFormattedValue { + value: Compare( + ExprCompare { + left: Constant( + ExprConstant { + value: Int( + 42, + ), + kind: None, + range: 3..5, }, ), + ops: [ + Eq, + ], + comparators: [ + Constant( + ExprConstant { + value: Int( + 42, + ), + kind: None, + range: 9..11, + }, + ), + ], + range: 3..11, }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..13, - }, - ), - }, + ), + 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 83082db..61264fa 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 @@ -3,63 +3,48 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "foo", - ), - ctx: Load, - range: 3..6, - }, + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "foo", ), + ctx: Load, + range: 3..6, }, - conversion: Int( - 0, - ), - format_spec: Some( - Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "spec", - ), - ctx: Load, - range: 8..12, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..15, - }, - ), - }, - ], - range: 0..15, - }, - ), + ), + conversion: Int( + 0, + ), + format_spec: Some( + JoinedStr( + ExprJoinedStr { + values: [ + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "spec", + ), + ctx: Load, + range: 8..12, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..15, + }, + ), + ], + 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 ecdaf89..4b570c0 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 @@ -3,53 +3,41 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Compare( - ExprCompare { - left: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 1, - ), - kind: None, - range: 3..4, - }, - ), - }, - ops: [ - NotEq, - ], - comparators: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Int( - 2, - ), - kind: None, - range: 8..9, - }, - ), - }, - ], - range: 3..9, + FormattedValue( + ExprFormattedValue { + value: Compare( + ExprCompare { + left: Constant( + ExprConstant { + value: Int( + 1, + ), + kind: None, + range: 3..4, }, ), + ops: [ + NotEq, + ], + comparators: [ + Constant( + ExprConstant { + value: Int( + 2, + ), + kind: None, + range: 8..9, + }, + ), + ], + range: 3..9, }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..11, - }, - ), - }, + ), + 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 3da4959..fd86cf2 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 @@ -3,51 +3,39 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "foo", - ), - ctx: Load, - range: 3..6, - }, + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "foo", ), + ctx: Load, + range: 3..6, }, - conversion: Int( - 0, - ), - format_spec: Some( - Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "spec", - ), - kind: None, - range: 0..13, - }, - ), - }, - ], - range: 0..13, - }, - ), + ), + conversion: Int( + 0, + ), + format_spec: Some( + JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "spec", + ), + kind: None, + range: 0..13, + }, + ), + ], + 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 b016445..20b0fdd 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 @@ -3,52 +3,40 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "x =", - ), - kind: None, - range: 0..10, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "", - ), - kind: None, - range: 0..10, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 3..4, - }, + Constant( + ExprConstant { + value: Str( + "x =", + ), + kind: None, + range: 0..10, + }, + ), + Constant( + ExprConstant { + value: Str( + "", + ), + kind: None, + range: 0..10, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "x", ), + ctx: Load, + range: 3..4, }, - conversion: Int( - 114, - ), - format_spec: None, - range: 0..10, - }, - ), - }, + ), + 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 d76a671..8eb93f1 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 @@ -3,52 +3,40 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "x=", - ), - kind: None, - range: 0..10, - }, - ), - }, - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - " ", - ), - kind: None, - range: 0..10, - }, - ), - }, - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 3..4, - }, + Constant( + ExprConstant { + value: Str( + "x=", + ), + kind: None, + range: 0..10, + }, + ), + Constant( + ExprConstant { + value: Str( + " ", + ), + kind: None, + range: 0..10, + }, + ), + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "x", ), + ctx: Load, + range: 3..4, }, - conversion: Int( - 114, - ), - format_spec: None, - range: 0..10, - }, - ), - }, + ), + 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 ea72de4..7098bc2 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 @@ -3,25 +3,19 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Yield( - ExprYield { - value: None, - range: 3..8, - }, - ), + FormattedValue( + ExprFormattedValue { + value: Yield( + ExprYield { + value: None, + range: 3..8, }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..10, - }, - ), - }, + ), + 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 d80e092..e8803da 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 @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 0..16, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "Hello world", ), + kind: None, + range: 0..16, }, - 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 1315e84..ba3bef0 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 @@ -3,26 +3,20 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello, world!", - ), - kind: Some( - "u", - ), - range: 0..20, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "Hello, world!", ), + kind: Some( + "u", + ), + range: 0..20, }, - 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 dc3096f..3f40f93 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 @@ -3,36 +3,27 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: Some( - "u", - ), - range: 0..18, - }, - ), - }, - ], - range: 0..18, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "Hello world", + ), + kind: Some( + "u", + ), + range: 0..18, + }, + ), + ], + 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 f1642ba..9e86d60 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 @@ -3,36 +3,27 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world!", - ), - kind: Some( - "u", - ), - range: 0..22, - }, - ), - }, - ], - range: 0..22, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + Constant( + ExprConstant { + value: Str( + "Hello world!", + ), + kind: Some( + "u", + ), + range: 0..22, + }, + ), + ], + 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 a235e1a..50cfc85 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 @@ -3,24 +3,18 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: None, - range: 0..17, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + 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_u_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap index 3fb999c..9374488 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 @@ -3,26 +3,20 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Str( - "Hello world", - ), - kind: Some( - "u", - ), - range: 0..17, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Str( + "Hello world", ), + kind: Some( + "u", + ), + range: 0..17, }, - 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 1d0fa8a..bf9dad4 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 @@ -3,29 +3,23 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Bytes( - [ - 92, - 120, - 49, - 122, - ], - ), - kind: None, - range: 0..8, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Bytes( + [ + 92, + 120, + 49, + 122, + ], ), + kind: None, + range: 0..8, }, - 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 de95f65..fda9f3a 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 @@ -3,27 +3,21 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Bytes( - [ - 92, - 92, - ], - ), - kind: None, - range: 0..6, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Bytes( + [ + 92, + 92, + ], ), + kind: None, + range: 0..6, }, - 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 6312c3d..72057a9 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__raw_fstring.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__raw_fstring.snap @@ -3,46 +3,34 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 4..5, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..7, - }, - ), - }, - ], - range: 0..7, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 4..5, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..7, + }, + ), + ], + 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 2a2ce24..259901d 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 @@ -3,281 +3,275 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: Constant( - ExprConstant { - value: Bytes( - [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, - 48, - 49, - 50, - 51, - 52, - 53, - 54, - 55, - 56, - 57, - 58, - 59, - 60, - 61, - 62, - 63, - 64, - 65, - 66, - 67, - 68, - 69, - 70, - 71, - 72, - 73, - 74, - 75, - 76, - 77, - 78, - 79, - 80, - 81, - 82, - 83, - 84, - 85, - 86, - 87, - 88, - 89, - 90, - 91, - 92, - 93, - 94, - 95, - 96, - 97, - 98, - 99, - 100, - 101, - 102, - 103, - 104, - 105, - 106, - 107, - 108, - 109, - 110, - 111, - 112, - 113, - 114, - 115, - 116, - 117, - 118, - 119, - 120, - 121, - 122, - 123, - 124, - 125, - 126, - 127, - 128, - 129, - 130, - 131, - 132, - 133, - 134, - 135, - 136, - 137, - 138, - 139, - 140, - 141, - 142, - 143, - 144, - 145, - 146, - 147, - 148, - 149, - 150, - 151, - 152, - 153, - 154, - 155, - 156, - 157, - 158, - 159, - 160, - 161, - 162, - 163, - 164, - 165, - 166, - 167, - 168, - 169, - 170, - 171, - 172, - 173, - 174, - 175, - 176, - 177, - 178, - 179, - 180, - 181, - 182, - 183, - 184, - 185, - 186, - 187, - 188, - 189, - 190, - 191, - 192, - 193, - 194, - 195, - 196, - 197, - 198, - 199, - 200, - 201, - 202, - 203, - 204, - 205, - 206, - 207, - 208, - 209, - 210, - 211, - 212, - 213, - 214, - 215, - 216, - 217, - 218, - 219, - 220, - 221, - 222, - 223, - 224, - 225, - 226, - 227, - 228, - 229, - 230, - 231, - 232, - 233, - 234, - 235, - 236, - 237, - 238, - 239, - 240, - 241, - 242, - 243, - 244, - 245, - 246, - 247, - 248, - 249, - 250, - 251, - 252, - 253, - 254, - 255, - ], - ), - kind: None, - range: 0..738, - }, + Expr( + StmtExpr { + value: Constant( + ExprConstant { + value: Bytes( + [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 126, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + 162, + 163, + 164, + 165, + 166, + 167, + 168, + 169, + 170, + 171, + 172, + 173, + 174, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, + 183, + 184, + 185, + 186, + 187, + 188, + 189, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 199, + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 209, + 210, + 211, + 212, + 213, + 214, + 215, + 216, + 217, + 218, + 219, + 220, + 221, + 222, + 223, + 224, + 225, + 226, + 227, + 228, + 229, + 230, + 231, + 232, + 233, + 234, + 235, + 236, + 237, + 238, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 249, + 250, + 251, + 252, + 253, + 254, + 255, + ], ), + kind: None, + range: 0..738, }, - 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 2d04c25..89064bd 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 @@ -3,46 +3,34 @@ source: parser/src/string.rs expression: parse_ast --- [ - Attributed { - custom: (), - node: Expr( - StmtExpr { - value: Attributed { - custom: (), - node: JoinedStr( - ExprJoinedStr { - values: [ - Attributed { - custom: (), - node: FormattedValue( - ExprFormattedValue { - value: Attributed { - custom: (), - node: Name( - ExprName { - id: Identifier( - "x", - ), - ctx: Load, - range: 6..7, - }, - ), - }, - conversion: Int( - 0, - ), - format_spec: None, - range: 0..11, - }, - ), - }, - ], - range: 0..11, - }, - ), + Expr( + StmtExpr { + value: JoinedStr( + ExprJoinedStr { + values: [ + FormattedValue( + ExprFormattedValue { + value: Name( + ExprName { + id: Identifier( + "x", + ), + ctx: Load, + range: 6..7, + }, + ), + conversion: Int( + 0, + ), + format_spec: None, + range: 0..11, + }, + ), + ], + range: 0..11, }, - range: 0..11, - }, - ), - }, + ), + range: 0..11, + }, + ), ] diff --git a/parser/src/string.rs b/parser/src/string.rs index 1056b7e..f1fa073 100644 --- a/parser/src/string.rs +++ b/parser/src/string.rs @@ -5,7 +5,7 @@ // we have to do the parsing here, manually. use crate::text_size::TextRange; use crate::{ - ast::{self, Constant, Expr, ExprKind, Int}, + ast::{self, Constant, Expr, Int}, lexer::{LexicalError, LexicalErrorType}, parser::{parse_expression_starts_at, LalrpopError, ParseError, ParseErrorType}, token::{StringKind, Tok}, @@ -68,8 +68,8 @@ impl<'a> StringParser<'a> { } #[inline] - fn expr(&self, node: ExprKind) -> Expr { - Expr::new(node) + fn expr(&self, node: Expr) -> Expr { + node } fn range(&self) -> TextRange { @@ -631,8 +631,8 @@ pub(crate) fn parse_strings( let mut content: Vec = vec![]; for (start, (source, kind, triple_quoted), end) in values { for value in parse_string(&source, kind, triple_quoted, start, end)? { - match value.into_node() { - ExprKind::Constant(ast::ExprConstant { + match value { + Expr::Constant(ast::ExprConstant { value: Constant::Bytes(value), .. }) => content.extend(value), @@ -640,19 +640,20 @@ pub(crate) fn parse_strings( } } } - return Ok(Expr::new(ast::ExprConstant { + return Ok(ast::ExprConstant { value: Constant::Bytes(content), kind: None, range: TextRange::new(initial_start, last_end), - })); + } + .into()); } if !has_fstring { let mut content: Vec = vec![]; for (start, (source, kind, triple_quoted), end) in values { for value in parse_string(&source, kind, triple_quoted, start, end)? { - match value.into_node() { - ExprKind::Constant(ast::ExprConstant { + match value { + Expr::Constant(ast::ExprConstant { value: Constant::Str(value), .. }) => content.push(value), @@ -660,11 +661,12 @@ pub(crate) fn parse_strings( } } } - return Ok(Expr::new(ast::ExprConstant { + return Ok(ast::ExprConstant { value: Constant::Str(content.join("")), kind: initial_kind, range: TextRange::new(initial_start, last_end), - })); + } + .into()); } // De-duplicate adjacent constants. @@ -672,7 +674,7 @@ pub(crate) fn parse_strings( let mut current: Vec = vec![]; let take_current = |current: &mut Vec| -> Expr { - Expr::new(ast::ExprConstant { + Expr::Constant(ast::ExprConstant { value: Constant::Str(current.drain(..).join("")), kind: initial_kind.clone(), range: TextRange::new(initial_start, last_end), @@ -681,14 +683,14 @@ pub(crate) fn parse_strings( for (start, (source, kind, triple_quoted), end) in values { for value in parse_string(&source, kind, triple_quoted, start, end)? { - match value.node { - ExprKind::FormattedValue { .. } => { + match value { + Expr::FormattedValue { .. } => { if !current.is_empty() { deduped.push(take_current(&mut current)); } deduped.push(value) } - ExprKind::Constant(ast::ExprConstant { + Expr::Constant(ast::ExprConstant { value: Constant::Str(value), .. }) => current.push(value), @@ -700,7 +702,7 @@ pub(crate) fn parse_strings( deduped.push(take_current(&mut current)); } - Ok(Expr::new(ast::ExprJoinedStr { + Ok(Expr::JoinedStr(ast::ExprJoinedStr { values: deduped, range: TextRange::new(initial_start, last_end), }))