Python/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff synced 2026-01-11 00:24:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Give identifier and int ast types

Browse Source
This commit is contained in:
Jeong YunWon
2023-05-10 19:17:11 +09:00
parent d495cd9129
commit 455bcc01a0
88 changed files with 3288 additions and 2300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
parser/src/function.rs
View File

@@ -84,7 +84,10 @@ pub(crate) fn parse_params(
Ok((pos_only, names, defaults))
}
type FunctionArgument = (Option<(TextSize, TextSize, Option<String>)>, ast::Expr);
type FunctionArgument = (
Option<(TextSize, TextSize, Option<ast::Identifier>)>,
ast::Expr,
);
// Parse arguments as supplied during a function/lambda *call*.
pub(crate) fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, LexicalError> {
@@ -115,7 +118,10 @@ pub(crate) fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentLis
keywords.push(ast::Keyword::new(
start..end,
ast::KeywordData { arg: name, value },
ast::KeywordData {
arg: name.map(ast::Identifier::new),
value,
},
));
}
None => {

42
parser/src/python.lalrpop
View File

@@ -132,7 +132,7 @@ ExpressionStatement: ast::Stmt = {
target: Box::new(set_context(target, ast::ExprContext::Store)),
annotation: Box::new(annotation),
value: rhs.map(Box::new),
simple: if simple { 1 } else { 0 },
simple: ast::Int::new_bool(simple),
}.into(),
)
},
@@ -255,18 +255,18 @@ ImportStatement: ast::Stmt = {
},
};
ImportFromLocation: (Option<u32>, Option<String>) = {
ImportFromLocation: (Option<ast::Int>, Option<ast::Identifier>) = {
<dots: ImportDots*> <name:DottedName> => {
(Some(dots.iter().sum()), Some(name))
(Some(ast::Int::new(dots.iter().map(ast::Int::to_u32).sum())), Some(name))
},
<dots: ImportDots+> => {
(Some(dots.iter().sum()), None)
(Some(ast::Int::new(dots.iter().map(ast::Int::to_u32).sum())), None)
},
};
ImportDots: u32 = {
"..." => 3,
"." => 1,
ImportDots: ast::Int = {
"..." => ast::Int::new(3),
"." => ast::Int::new(3),
};
ImportAsNames: Vec<ast::Alias> = {
@@ -274,7 +274,7 @@ ImportAsNames: Vec<ast::Alias> = {
<location:@L> "(" <i:OneOrMore<ImportAsAlias<Identifier>>> ","? ")" <end_location:@R> => i,
<location:@L> "*" <end_location:@R> => {
// Star import all
vec![ast::Alias::new(location..end_location, ast::AliasData { name: "*".to_string(), asname: None })]
vec![ast::Alias::new(location..end_location, ast::AliasData { name: ast::Identifier::new("*"), asname: None })]
},
};
@@ -285,15 +285,15 @@ ImportAsAlias<I>: ast::Alias = {
}
// A name like abc or abc.def.ghi
DottedName: String = {
<n:name> => n,
DottedName: ast::Identifier = {
<n:name> => ast::Identifier::new(n),
<n:name> <n2: ("." Identifier)+> => {
let mut r = n.to_string();
for x in n2 {
r.push_str(".");
r.push_str(&x.1);
r.push('.');
r.push_str(x.1.as_str());
}
r
ast::Identifier::new(r)
},
};
@@ -449,7 +449,7 @@ Pattern: ast::Pattern = {
AsPattern: ast::Pattern = {
<location:@L> <pattern:OrPattern> "as" <name:Identifier> <end_location:@R> =>? {
if name == "_" {
if name.as_str() == "_" {
Err(LexicalError {
error: LexicalErrorType::OtherError("cannot use '_' as a target".to_string()),
location,
@@ -538,7 +538,7 @@ SequencePattern: ast::PatternKind = {
StarPattern: ast::PatternKind = {
<location:@L> "*" <name:Identifier> <end_location:@R> => ast::PatternMatchStar {
name: if name == "_" { None } else { Some(name) }
name: if name.as_str() == "_" { None } else { Some(name) }
}.into(),
}
@@ -598,7 +598,7 @@ LiteralPattern: ast::PatternKind = {
CapturePattern: ast::PatternKind = {
<location:@L> <name:Identifier> <end_location:@R> => ast::PatternMatchAs {
pattern: None,
name: if name == "_" { None } else { Some(name) }
name: if name.as_str() == "_" { None } else { Some(name) }
}.into(),
}
@@ -709,7 +709,7 @@ MappingPattern: ast::PatternKind = {
},
}
MatchKeywordEntry: (String, ast::Pattern) = {
MatchKeywordEntry: (ast::Identifier, ast::Pattern) = {
<k:Identifier> "=" <v:Pattern> => (k, v),
};
@@ -1707,7 +1707,7 @@ SingleForComprehension: ast::Comprehension = {
target: set_context(target, ast::ExprContext::Store),
iter,
ifs,
is_async: if is_async { 1 } else { 0 },
is_async: ast::Int::new_bool(is_async),
}
}
};
@@ -1722,7 +1722,7 @@ ArgumentList: ArgumentList = {
}
};
FunctionArgument: (Option<(TextSize, TextSize, Option<String>)>, ast::Expr) = {
FunctionArgument: (Option<(TextSize, TextSize, Option<ast::Identifier>)>, ast::Expr) = {
<location:@L> <e:NamedExpressionTest> <c:CompFor?> <end_location:@R> => {
let expr = match c {
Some(c) => ast::Expr::new(
@@ -1772,7 +1772,9 @@ Constant: ast::Constant = {
<s:complex> => ast::Constant::Complex { real: s.0, imag: s.1 },
};
Identifier: String = <s:name> => s;
Identifier: ast::Identifier = {
<s:name> => ast::Identifier::new(s)
};
// Hook external lexer:
extern {

3241
parser/src/python.rs generated
View File

File diff suppressed because it is too large Load Diff

12
parser/src/snapshots/rustpython_parser__context__tests__ann_assign_name.snap generated
View File

@@ -13,7 +13,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -23,7 +25,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "int",
id: Identifier(
"int",
),
ctx: Load,
},
),
@@ -42,7 +46,9 @@ expression: parse_ast
),
},
),
simple: 1,
simple: Int(
1,
),
},
),
},

8
parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap generated
View File

@@ -19,12 +19,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
attr: "y",
attr: Identifier(
"y",
),
ctx: Store,
},
),

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

@@ -13,7 +13,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),

8
parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap generated
View File

@@ -20,7 +20,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -30,7 +32,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),

16
parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap generated
View File

@@ -14,7 +14,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -30,7 +32,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),
@@ -42,7 +46,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -95,7 +101,9 @@ expression: parse_ast
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
],
},

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

@@ -14,7 +14,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),

4
parser/src/snapshots/rustpython_parser__context__tests__assign_named_expr.snap generated
View File

@@ -18,7 +18,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),

16
parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap generated
View File

@@ -14,7 +14,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -30,7 +32,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),
@@ -42,7 +46,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -95,7 +101,9 @@ expression: parse_ast
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
],
},

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

@@ -20,7 +20,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -35,7 +37,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),

8
parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap generated
View File

@@ -19,7 +19,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -29,7 +31,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),

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

@@ -20,7 +20,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -30,7 +32,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),

4
parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap generated
View File

@@ -28,7 +28,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),

8
parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap generated
View File

@@ -18,12 +18,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
attr: "y",
attr: Identifier(
"y",
),
ctx: Store,
},
),

4
parser/src/snapshots/rustpython_parser__context__tests__aug_assign_name.snap generated
View File

@@ -13,7 +13,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),

8
parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap generated
View File

@@ -18,7 +18,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -28,7 +30,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),

8
parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap generated
View File

@@ -19,12 +19,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
attr: "y",
attr: Identifier(
"y",
),
ctx: Del,
},
),

4
parser/src/snapshots/rustpython_parser__context__tests__del_name.snap generated
View File

@@ -14,7 +14,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Del,
},
),

8
parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap generated
View File

@@ -19,7 +19,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -29,7 +31,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),

16
parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [],
@@ -19,7 +21,9 @@ Ok(
range: 9..10,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -28,7 +32,9 @@ Ok(
range: 12..13,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -37,7 +43,9 @@ Ok(
range: 15..16,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},

16
parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [],
@@ -19,7 +21,9 @@ Ok(
range: 9..10,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -28,7 +32,9 @@ Ok(
range: 12..13,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -37,7 +43,9 @@ Ok(
range: 18..19,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},

4
parser/src/snapshots/rustpython_parser__function__tests__function_no_args.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [],

28
parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [
@@ -17,7 +19,9 @@ Ok(
range: 6..7,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -26,7 +30,9 @@ Ok(
range: 9..10,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -35,7 +41,9 @@ Ok(
range: 12..13,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},
@@ -47,7 +55,9 @@ Ok(
range: 18..19,
custom: (),
node: ArgData {
arg: "d",
arg: Identifier(
"d",
),
annotation: None,
type_comment: None,
},
@@ -56,7 +66,9 @@ Ok(
range: 21..22,
custom: (),
node: ArgData {
arg: "e",
arg: Identifier(
"e",
),
annotation: None,
type_comment: None,
},
@@ -65,7 +77,9 @@ Ok(
range: 24..25,
custom: (),
node: ArgData {
arg: "f",
arg: Identifier(
"f",
),
annotation: None,
type_comment: None,
},

28
parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [
@@ -17,7 +19,9 @@ Ok(
range: 6..7,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -26,7 +30,9 @@ Ok(
range: 9..10,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -35,7 +41,9 @@ Ok(
range: 12..13,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},
@@ -47,7 +55,9 @@ Ok(
range: 18..19,
custom: (),
node: ArgData {
arg: "d",
arg: Identifier(
"d",
),
annotation: None,
type_comment: None,
},
@@ -56,7 +66,9 @@ Ok(
range: 21..22,
custom: (),
node: ArgData {
arg: "e",
arg: Identifier(
"e",
),
annotation: None,
type_comment: None,
},
@@ -65,7 +77,9 @@ Ok(
range: 27..28,
custom: (),
node: ArgData {
arg: "f",
arg: Identifier(
"f",
),
annotation: None,
type_comment: None,
},

32
parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [
@@ -17,7 +19,9 @@ Ok(
range: 6..7,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -26,7 +30,9 @@ Ok(
range: 9..10,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -35,7 +41,9 @@ Ok(
range: 12..13,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},
@@ -46,7 +54,9 @@ Ok(
range: 16..20,
custom: (),
node: ArgData {
arg: "args",
arg: Identifier(
"args",
),
annotation: None,
type_comment: None,
},
@@ -57,7 +67,9 @@ Ok(
range: 22..23,
custom: (),
node: ArgData {
arg: "d",
arg: Identifier(
"d",
),
annotation: None,
type_comment: None,
},
@@ -66,7 +78,9 @@ Ok(
range: 25..26,
custom: (),
node: ArgData {
arg: "e",
arg: Identifier(
"e",
),
annotation: None,
type_comment: None,
},
@@ -75,7 +89,9 @@ Ok(
range: 31..32,
custom: (),
node: ArgData {
arg: "f",
arg: Identifier(
"f",
),
annotation: None,
type_comment: None,
},

36
parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [
@@ -17,7 +19,9 @@ Ok(
range: 6..7,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -26,7 +30,9 @@ Ok(
range: 9..10,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -35,7 +41,9 @@ Ok(
range: 12..13,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},
@@ -46,7 +54,9 @@ Ok(
range: 16..20,
custom: (),
node: ArgData {
arg: "args",
arg: Identifier(
"args",
),
annotation: None,
type_comment: None,
},
@@ -57,7 +67,9 @@ Ok(
range: 22..23,
custom: (),
node: ArgData {
arg: "d",
arg: Identifier(
"d",
),
annotation: None,
type_comment: None,
},
@@ -66,7 +78,9 @@ Ok(
range: 25..26,
custom: (),
node: ArgData {
arg: "e",
arg: Identifier(
"e",
),
annotation: None,
type_comment: None,
},
@@ -75,7 +89,9 @@ Ok(
range: 31..32,
custom: (),
node: ArgData {
arg: "f",
arg: Identifier(
"f",
),
annotation: None,
type_comment: None,
},
@@ -112,7 +128,9 @@ Ok(
range: 39..45,
custom: (),
node: ArgData {
arg: "kwargs",
arg: Identifier(
"kwargs",
),
annotation: None,
type_comment: None,
},

16
parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [
@@ -17,7 +19,9 @@ Ok(
range: 6..7,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -26,7 +30,9 @@ Ok(
range: 9..10,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -35,7 +41,9 @@ Ok(
range: 12..13,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},

16
parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap generated
View File

@@ -9,7 +9,9 @@ Ok(
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "f",
name: Identifier(
"f",
),
args: Arguments {
posonlyargs: [],
args: [
@@ -17,7 +19,9 @@ Ok(
range: 6..7,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -26,7 +30,9 @@ Ok(
range: 9..10,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -35,7 +41,9 @@ Ok(
range: 15..16,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},

12
parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args.snap generated
View File

@@ -23,7 +23,9 @@ Ok(
range: 10..11,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -32,7 +34,9 @@ Ok(
range: 13..14,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -41,7 +45,9 @@ Ok(
range: 16..17,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},

12
parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args_with_defaults.snap generated
View File

@@ -23,7 +23,9 @@ Ok(
range: 10..11,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -32,7 +34,9 @@ Ok(
range: 13..14,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -41,7 +45,9 @@ Ok(
range: 19..20,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},

20
parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_and_kw_only_args.snap generated
View File

@@ -21,7 +21,9 @@ Ok(
range: 7..8,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -30,7 +32,9 @@ Ok(
range: 10..11,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -39,7 +43,9 @@ Ok(
range: 13..14,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},
@@ -51,7 +57,9 @@ Ok(
range: 19..20,
custom: (),
node: ArgData {
arg: "d",
arg: Identifier(
"d",
),
annotation: None,
type_comment: None,
},
@@ -60,7 +68,9 @@ Ok(
range: 22..23,
custom: (),
node: ArgData {
arg: "e",
arg: Identifier(
"e",
),
annotation: None,
type_comment: None,
},

12
parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args.snap generated
View File

@@ -21,7 +21,9 @@ Ok(
range: 7..8,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -30,7 +32,9 @@ Ok(
range: 10..11,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -39,7 +43,9 @@ Ok(
range: 13..14,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},

12
parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args_with_defaults.snap generated
View File

@@ -21,7 +21,9 @@ Ok(
range: 7..8,
custom: (),
node: ArgData {
arg: "a",
arg: Identifier(
"a",
),
annotation: None,
type_comment: None,
},
@@ -30,7 +32,9 @@ Ok(
range: 10..11,
custom: (),
node: ArgData {
arg: "b",
arg: Identifier(
"b",
),
annotation: None,
type_comment: None,
},
@@ -39,7 +43,9 @@ Ok(
range: 16..17,
custom: (),
node: ArgData {
arg: "c",
arg: Identifier(
"c",
),
annotation: None,
type_comment: None,
},

4
parser/src/snapshots/rustpython_parser__parser__tests__dict_unpacking.snap generated
View File

@@ -56,7 +56,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "c",
id: Identifier(
"c",
),
ctx: Load,
},
),

32
parser/src/snapshots/rustpython_parser__parser__tests__generator_expression_argument.snap generated
View File

@@ -24,7 +24,9 @@ Attributed {
},
),
},
attr: "join",
attr: Identifier(
"join",
),
ctx: Load,
},
),
@@ -40,7 +42,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "sql",
id: Identifier(
"sql",
),
ctx: Load,
},
),
@@ -52,7 +56,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "sql",
id: Identifier(
"sql",
),
ctx: Store,
},
),
@@ -73,7 +79,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "limit",
id: Identifier(
"limit",
),
ctx: Load,
},
),
@@ -101,7 +109,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "limit",
id: Identifier(
"limit",
),
ctx: Load,
},
),
@@ -132,7 +142,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "offset",
id: Identifier(
"offset",
),
ctx: Load,
},
),
@@ -160,7 +172,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "offset",
id: Identifier(
"offset",
),
ctx: Load,
},
),
@@ -187,7 +201,9 @@ Attributed {
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
],
},

52
parser/src/snapshots/rustpython_parser__parser__tests__match.snap generated
View File

@@ -56,7 +56,9 @@ expression: parse_ast
keys: [],
patterns: [],
rest: Some(
"rest",
Identifier(
"rest",
),
),
},
),
@@ -78,7 +80,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),
@@ -89,7 +93,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "rest",
id: Identifier(
"rest",
),
ctx: Load,
},
),
@@ -195,7 +201,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "str",
id: Identifier(
"str",
),
ctx: Load,
},
),
@@ -221,7 +229,9 @@ expression: parse_ast
},
),
name: Some(
"label",
Identifier(
"label",
),
),
},
),
@@ -248,7 +258,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),
@@ -259,7 +271,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "label",
id: Identifier(
"label",
),
ctx: Load,
},
),
@@ -288,7 +302,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -358,7 +374,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -396,7 +414,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -466,7 +486,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -504,7 +526,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -554,7 +578,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),

200
parser/src/snapshots/rustpython_parser__parser__tests__match_as_identifier.snap generated
View File

@@ -29,7 +29,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -40,7 +42,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -54,7 +58,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
@@ -67,7 +73,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "c",
id: Identifier(
"c",
),
ctx: Load,
},
),
@@ -101,7 +109,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -117,7 +127,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -128,7 +140,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
@@ -144,7 +158,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "c",
id: Identifier(
"c",
),
ctx: Load,
},
),
@@ -172,7 +188,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -193,7 +211,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -204,7 +224,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
@@ -221,7 +243,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "c",
id: Identifier(
"c",
),
ctx: Load,
},
),
@@ -254,7 +278,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -270,7 +296,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -281,7 +309,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
@@ -298,7 +328,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "c",
id: Identifier(
"c",
),
ctx: Load,
},
),
@@ -329,7 +361,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -345,7 +379,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -356,7 +392,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
@@ -373,7 +411,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "c",
id: Identifier(
"c",
),
ctx: Load,
},
),
@@ -409,7 +449,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -426,7 +468,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -445,7 +489,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
@@ -459,7 +505,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "c",
id: Identifier(
"c",
),
ctx: Load,
},
),
@@ -490,7 +538,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -500,7 +550,9 @@ expression: parse_ast
},
),
},
attr: "a",
attr: Identifier(
"a",
),
ctx: Load,
},
),
@@ -528,7 +580,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -549,7 +603,9 @@ expression: parse_ast
},
),
},
attr: "a",
attr: Identifier(
"a",
),
ctx: Load,
},
),
@@ -577,7 +633,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -598,7 +656,9 @@ expression: parse_ast
},
),
},
attr: "a",
attr: Identifier(
"a",
),
ctx: Load,
},
),
@@ -626,7 +686,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -636,7 +698,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -645,7 +709,9 @@ expression: parse_ast
},
),
},
attr: "b",
attr: Identifier(
"b",
),
ctx: Load,
},
),
@@ -673,7 +739,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -689,7 +757,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -703,7 +773,9 @@ expression: parse_ast
},
),
},
attr: "b",
attr: Identifier(
"b",
),
ctx: Load,
},
),
@@ -731,7 +803,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -747,7 +821,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -761,7 +837,9 @@ expression: parse_ast
},
),
},
attr: "b",
attr: Identifier(
"b",
),
ctx: Load,
},
),
@@ -789,7 +867,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -810,7 +890,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -822,7 +904,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
@@ -854,7 +938,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Store,
},
),
@@ -895,7 +981,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),
@@ -976,7 +1064,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Store,
},
),
@@ -994,7 +1084,9 @@ expression: parse_ast
range: 597..602,
custom: (),
node: ArgData {
arg: "query",
arg: Identifier(
"query",
),
annotation: None,
type_comment: None,
},
@@ -1016,7 +1108,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "query",
id: Identifier(
"query",
),
ctx: Load,
},
),
@@ -1030,7 +1124,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "event",
id: Identifier(
"event",
),
ctx: Load,
},
),
@@ -1061,7 +1157,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),
@@ -1077,7 +1175,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "match",
id: Identifier(
"match",
),
ctx: Load,
},
),

8
parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_and.snap generated
View File

@@ -14,7 +14,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -24,7 +26,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),

8
parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_or.snap generated
View File

@@ -14,7 +14,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -24,7 +26,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),

32
parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap generated
View File

@@ -8,14 +8,18 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: ClassDef(
StmtClassDef {
name: "Foo",
name: Identifier(
"Foo",
),
bases: [
Attributed {
range: 10..11,
custom: (),
node: Name(
ExprName {
id: "A",
id: Identifier(
"A",
),
ctx: Load,
},
),
@@ -25,7 +29,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "B",
id: Identifier(
"B",
),
ctx: Load,
},
),
@@ -38,7 +44,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "__init__",
name: Identifier(
"__init__",
),
args: Arguments {
posonlyargs: [],
args: [
@@ -46,7 +54,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
range: 31..35,
custom: (),
node: ArgData {
arg: "self",
arg: Identifier(
"self",
),
annotation: None,
type_comment: None,
},
@@ -76,7 +86,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "method_with_default",
name: Identifier(
"method_with_default",
),
args: Arguments {
posonlyargs: [],
args: [
@@ -84,7 +96,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
range: 70..74,
custom: (),
node: ArgData {
arg: "self",
arg: Identifier(
"self",
),
annotation: None,
type_comment: None,
},
@@ -93,7 +107,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
range: 76..79,
custom: (),
node: ArgData {
arg: "arg",
arg: Identifier(
"arg",
),
annotation: None,
type_comment: None,
},

20
parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap generated
View File

@@ -12,7 +12,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x1",
id: Identifier(
"x1",
),
ctx: Load,
},
),
@@ -22,7 +24,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x2",
id: Identifier(
"x2",
),
ctx: Load,
},
),
@@ -34,7 +38,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -44,13 +50,17 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "z",
id: Identifier(
"z",
),
ctx: Load,
},
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
],
},

40
parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap generated
View File

@@ -12,7 +12,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -30,7 +32,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -40,7 +44,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y2",
id: Identifier(
"y2",
),
ctx: Store,
},
),
@@ -55,13 +61,17 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "z",
id: Identifier(
"z",
),
ctx: Load,
},
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
Comprehension {
target: Attributed {
@@ -69,7 +79,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -79,7 +91,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
@@ -95,7 +109,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -130,7 +146,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -156,7 +174,9 @@ Attributed {
),
},
],
is_async: 0,
is_async: Int(
0,
),
},
],
},

16
parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap generated
View File

@@ -12,7 +12,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -24,7 +26,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -34,13 +38,17 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "z",
id: Identifier(
"z",
),
ctx: Load,
},
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
],
},

24
parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap generated
View File

@@ -17,7 +17,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),
@@ -27,7 +29,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -37,7 +41,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),
@@ -52,7 +58,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -62,13 +70,17 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "z",
id: Identifier(
"z",
),
ctx: Load,
},
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
],
},

8
parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap generated
View File

@@ -18,7 +18,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "my_func",
id: Identifier(
"my_func",
),
ctx: Load,
},
),
@@ -43,7 +45,9 @@ expression: parse_ast
custom: (),
node: KeywordData {
arg: Some(
"keyword",
Identifier(
"keyword",
),
),
value: Attributed {
range: 30..31,

16
parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap generated
View File

@@ -20,7 +20,9 @@ expression: parse_ast
range: 7..8,
custom: (),
node: ArgData {
arg: "x",
arg: Identifier(
"x",
),
annotation: None,
type_comment: None,
},
@@ -29,7 +31,9 @@ expression: parse_ast
range: 10..11,
custom: (),
node: ArgData {
arg: "y",
arg: Identifier(
"y",
),
annotation: None,
type_comment: None,
},
@@ -51,7 +55,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -62,7 +68,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),

16
parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap generated
View File

@@ -12,7 +12,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
@@ -24,7 +26,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -34,13 +38,17 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "z",
id: Identifier(
"z",
),
ctx: Load,
},
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
],
},

20
parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap generated
View File

@@ -17,7 +17,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -32,7 +34,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Load,
},
),
@@ -63,7 +67,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -73,13 +79,17 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "z",
id: Identifier(
"z",
),
ctx: Load,
},
),
},
ifs: [],
is_async: 0,
is_async: Int(
0,
),
},
],
},

4
parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap generated
View File

@@ -18,7 +18,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),

4
parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap generated
View File

@@ -18,7 +18,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),

8
parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap generated
View File

@@ -20,7 +20,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -30,7 +32,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Store,
},
),

432
parser/src/snapshots/rustpython_parser__parser__tests__patma.snap generated
View File

File diff suppressed because it is too large Load Diff

4
parser/src/snapshots/rustpython_parser__parser__tests__slice.snap generated
View File

@@ -12,7 +12,9 @@ Attributed {
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),

44
parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap generated
View File

@@ -14,7 +14,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "array_slice",
id: Identifier(
"array_slice",
),
ctx: Store,
},
),
@@ -30,7 +32,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "array",
id: Identifier(
"array",
),
ctx: Load,
},
),
@@ -63,7 +67,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "indexes",
id: Identifier(
"indexes",
),
ctx: Load,
},
),
@@ -122,7 +128,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "array",
id: Identifier(
"array",
),
ctx: Load,
},
),
@@ -155,7 +163,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "indexes",
id: Identifier(
"indexes",
),
ctx: Load,
},
),
@@ -200,7 +210,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "array_slice",
id: Identifier(
"array_slice",
),
ctx: Load,
},
),
@@ -224,7 +236,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "array",
id: Identifier(
"array",
),
ctx: Load,
},
),
@@ -245,7 +259,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "indexes_to_select",
id: Identifier(
"indexes_to_select",
),
ctx: Load,
},
),
@@ -264,7 +280,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "indexes_to_select",
id: Identifier(
"indexes_to_select",
),
ctx: Load,
},
),
@@ -300,7 +318,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "array",
id: Identifier(
"array",
),
ctx: Load,
},
),
@@ -358,7 +378,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "indexes_to_select",
id: Identifier(
"indexes_to_select",
),
ctx: Load,
},
),

52
parser/src/snapshots/rustpython_parser__parser__tests__try.snap generated
View File

@@ -25,7 +25,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "ValueError",
id: Identifier(
"ValueError",
),
ctx: Load,
},
),
@@ -66,14 +68,18 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "TypeError",
id: Identifier(
"TypeError",
),
ctx: Load,
},
),
},
),
name: Some(
"e",
Identifier(
"e",
),
),
body: [
Attributed {
@@ -91,7 +97,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),
@@ -130,7 +138,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "type",
id: Identifier(
"type",
),
ctx: Load,
},
),
@@ -141,7 +151,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "e",
id: Identifier(
"e",
),
ctx: Load,
},
),
@@ -151,7 +163,9 @@ expression: parse_ast
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),
@@ -183,14 +197,18 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "OSError",
id: Identifier(
"OSError",
),
ctx: Load,
},
),
},
),
name: Some(
"e",
Identifier(
"e",
),
),
body: [
Attributed {
@@ -208,7 +226,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),
@@ -247,7 +267,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "type",
id: Identifier(
"type",
),
ctx: Load,
},
),
@@ -258,7 +280,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "e",
id: Identifier(
"e",
),
ctx: Load,
},
),
@@ -268,7 +292,9 @@ expression: parse_ast
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

92
parser/src/snapshots/rustpython_parser__parser__tests__try_star.snap generated
View File

@@ -25,7 +25,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "ExceptionGroup",
id: Identifier(
"ExceptionGroup",
),
ctx: Load,
},
),
@@ -59,7 +61,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "ValueError",
id: Identifier(
"ValueError",
),
ctx: Load,
},
),
@@ -92,7 +96,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "TypeError",
id: Identifier(
"TypeError",
),
ctx: Load,
},
),
@@ -125,7 +131,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "OSError",
id: Identifier(
"OSError",
),
ctx: Load,
},
),
@@ -158,7 +166,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "OSError",
id: Identifier(
"OSError",
),
ctx: Load,
},
),
@@ -209,14 +219,18 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "TypeError",
id: Identifier(
"TypeError",
),
ctx: Load,
},
),
},
),
name: Some(
"e",
Identifier(
"e",
),
),
body: [
Attributed {
@@ -234,7 +248,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),
@@ -273,7 +289,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "type",
id: Identifier(
"type",
),
ctx: Load,
},
),
@@ -284,7 +302,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "e",
id: Identifier(
"e",
),
ctx: Load,
},
),
@@ -294,7 +314,9 @@ expression: parse_ast
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),
@@ -326,17 +348,23 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "e",
id: Identifier(
"e",
),
ctx: Load,
},
),
},
attr: "exceptions",
attr: Identifier(
"exceptions",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),
@@ -368,14 +396,18 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "OSError",
id: Identifier(
"OSError",
),
ctx: Load,
},
),
},
),
name: Some(
"e",
Identifier(
"e",
),
),
body: [
Attributed {
@@ -393,7 +425,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "print",
id: Identifier(
"print",
),
ctx: Load,
},
),
@@ -432,7 +466,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "type",
id: Identifier(
"type",
),
ctx: Load,
},
),
@@ -443,7 +479,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "e",
id: Identifier(
"e",
),
ctx: Load,
},
),
@@ -453,7 +491,9 @@ expression: parse_ast
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),
@@ -485,17 +525,23 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "e",
id: Identifier(
"e",
),
ctx: Load,
},
),
},
attr: "exceptions",
attr: Identifier(
"exceptions",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

20
parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap generated
View File

@@ -8,7 +8,9 @@ expression: parse_ast
custom: (),
node: FunctionDef(
StmtFunctionDef {
name: "args_to_tuple",
name: Identifier(
"args_to_tuple",
),
args: Arguments {
posonlyargs: [],
args: [],
@@ -17,7 +19,9 @@ expression: parse_ast
range: 20..29,
custom: (),
node: ArgData {
arg: "args",
arg: Identifier(
"args",
),
annotation: Some(
Attributed {
range: 26..29,
@@ -29,7 +33,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "Ts",
id: Identifier(
"Ts",
),
ctx: Load,
},
),
@@ -80,7 +86,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "Tuple",
id: Identifier(
"Tuple",
),
ctx: Load,
},
),
@@ -95,7 +103,9 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "Ts",
id: Identifier(
"Ts",
),
ctx: Load,
},
),

112
parser/src/snapshots/rustpython_parser__parser__tests__with_statement.snap generated
View File

@@ -61,7 +61,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -153,7 +155,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -179,7 +183,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "y",
id: Identifier(
"y",
),
ctx: Store,
},
),
@@ -320,7 +326,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -393,7 +401,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -470,7 +480,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -558,7 +570,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -673,7 +687,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -715,7 +731,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -766,7 +784,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -786,7 +806,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -840,7 +862,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -903,7 +927,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
@@ -923,7 +949,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -959,7 +987,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -1010,7 +1040,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -1036,7 +1068,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -1078,7 +1112,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -1108,7 +1144,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Store,
},
),
@@ -1170,7 +1208,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -1200,7 +1240,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Store,
},
),
@@ -1231,7 +1273,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Store,
},
),
@@ -1275,7 +1319,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -1319,7 +1365,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -1363,7 +1411,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -1389,7 +1439,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Store,
},
),
@@ -1433,7 +1485,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Store,
},
),
@@ -1459,7 +1513,9 @@ expression: "parse_program(source, \"<test>\").unwrap()"
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Store,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_character.snap generated
View File

@@ -36,12 +36,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_newline.snap generated
View File

@@ -36,12 +36,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__fstring_line_continuation.snap generated
View File

@@ -36,12 +36,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base.snap generated
View File

@@ -37,12 +37,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "user",
id: Identifier(
"user",
),
ctx: Load,
},
),
},
conversion: 114,
conversion: Int(
114,
),
format_spec: None,
},
),

16
parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base_more.snap generated
View File

@@ -49,12 +49,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "user",
id: Identifier(
"user",
),
ctx: Load,
},
),
},
conversion: 114,
conversion: Int(
114,
),
format_spec: None,
},
),
@@ -105,12 +109,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "second",
id: Identifier(
"second",
),
ctx: Load,
},
),
},
conversion: 114,
conversion: Int(
114,
),
format_spec: None,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_format.snap generated
View File

@@ -37,12 +37,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "user",
id: Identifier(
"user",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: Some(
Attributed {
range: 0..14,

8
parser/src/snapshots/rustpython_parser__string__tests__fstring_unescaped_newline.snap generated
View File

@@ -36,12 +36,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

4
parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap generated
View File

@@ -43,7 +43,9 @@ expression: parse_ast
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

16
parser/src/snapshots/rustpython_parser__string__tests__parse_fstring.snap generated
View File

@@ -13,12 +13,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "a",
id: Identifier(
"a",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),
@@ -33,12 +37,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "b",
id: Identifier(
"b",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

4
parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_equals.snap generated
View File

@@ -45,7 +45,9 @@ expression: parse_ast
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

16
parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_nested_spec.snap generated
View File

@@ -13,12 +13,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "foo",
id: Identifier(
"foo",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: Some(
Attributed {
range: 0..15,
@@ -36,12 +40,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "spec",
id: Identifier(
"spec",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

4
parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_equals.snap generated
View File

@@ -45,7 +45,9 @@ expression: parse_ast
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_not_nested_spec.snap generated
View File

@@ -13,12 +13,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "foo",
id: Identifier(
"foo",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: Some(
Attributed {
range: 0..13,

8
parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_prec_space.snap generated
View File

@@ -37,12 +37,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
conversion: 114,
conversion: Int(
114,
),
format_spec: None,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_self_doc_trailing_space.snap generated
View File

@@ -37,12 +37,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
conversion: 114,
conversion: Int(
114,
),
format_spec: None,
},
),

4
parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_yield_expr.snap generated
View File

@@ -17,7 +17,9 @@ expression: parse_ast
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__raw_fstring.snap generated
View File

@@ -24,12 +24,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

8
parser/src/snapshots/rustpython_parser__string__tests__triple_quoted_raw_fstring.snap generated
View File

@@ -24,12 +24,16 @@ expression: parse_ast
custom: (),
node: Name(
ExprName {
id: "x",
id: Identifier(
"x",
),
ctx: Load,
},
),
},
conversion: 0,
conversion: Int(
0,
),
format_spec: None,
},
),

18
parser/src/string.rs
View File

@@ -4,7 +4,7 @@
// regular strings. Since the parser has no definition of f-string formats (Pending PEP 701)
// we have to do the parsing here, manually.
use crate::{
ast::{self, Constant, Expr, ExprKind},
ast::{self, Constant, Expr, ExprKind, Int},
lexer::{LexicalError, LexicalErrorType},
parser::{parse_expression_at, LalrpopError, ParseError, ParseErrorType},
token::{StringKind, Tok},
@@ -314,7 +314,7 @@ impl<'a> StringParser<'a> {
)
})?,
),
conversion: conversion as _,
conversion: Int::new(conversion as _),
format_spec: spec,
}
.into(),
@@ -345,13 +345,13 @@ impl<'a> StringParser<'a> {
)
})?,
),
conversion: (if conversion == ConversionFlag::None
&& spec.is_none()
{
ConversionFlag::Repr
} else {
conversion
}) as _,
conversion: ast::Int::new(
(if conversion == ConversionFlag::None && spec.is_none() {
ConversionFlag::Repr
} else {
conversion
}) as _,
),
format_spec: spec,
}
.into(),