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

Use method chaining

Browse source
This commit is contained in:
harupy 2022-12-12 10:24:00 +09:00
parent 5fc8c4d0b1
commit d6f9dd0763
1 changed files with 19 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

47
parser/python.lalrpop
View file

@ -360,15 +360,11 @@ IfStatement: ast::Stmt = {
<location:@L> "if" <test:NamedExpressionTest> ":" <body:Suite> <s2:(@L "elif" NamedExpressionTest ":" Suite)*> <s3:("else" ":" Suite)?> => { <location:@L> "if" <test:NamedExpressionTest> ":" <body:Suite> <s2:(@L "elif" NamedExpressionTest ":" Suite)*> <s3:("else" ":" Suite)?> => {
// Determine last else: // Determine last else:
let mut last = s3.map(|s| s.2).unwrap_or_default(); let mut last = s3.map(|s| s.2).unwrap_or_default();
let end_location = if let Some(last) = last.last() { let end_location = last
last.end_location .last()
} else { .map(|last| last.end_location)
if let Some(last) = s2.last() { .or_else(|| s2.last().map(|last| last.4.last().unwrap().end_location))
last.4.last().unwrap().end_location .unwrap_or_else(|| body.last().unwrap().end_location);
} else {
body.last().unwrap().end_location
}
};
// handle elif: // handle elif:
for i in s2.into_iter().rev() { for i in s2.into_iter().rev() {
let x = ast::Stmt { let x = ast::Stmt {
@ -391,11 +387,10 @@ IfStatement: ast::Stmt = {
WhileStatement: ast::Stmt = { WhileStatement: ast::Stmt = {
<location:@L> "while" <test:NamedExpressionTest> ":" <body:Suite> <s2:("else" ":" Suite)?> => { <location:@L> "while" <test:NamedExpressionTest> ":" <body:Suite> <s2:("else" ":" Suite)?> => {
let end_location = if let Some(ref s) = s2 { let end_location = s2
s.2.last().unwrap().end_location .as_ref()
} else { .map(|s| s.2.last().unwrap().end_location)
body.last().unwrap().end_location .unwrap_or_else(|| body.last().unwrap().end_location);
};
let orelse = s2.map(|s| s.2).unwrap_or_default(); let orelse = s2.map(|s| s.2).unwrap_or_default();
ast::Stmt { ast::Stmt {
custom: (), custom: (),
@ -412,11 +407,11 @@ WhileStatement: ast::Stmt = {
ForStatement: ast::Stmt = { ForStatement: ast::Stmt = {
<location:@L> <is_async:"async"?> "for" <target:ExpressionList> "in" <iter:TestList> ":" <body:Suite> <s2:("else" ":" Suite)?> => { <location:@L> <is_async:"async"?> "for" <target:ExpressionList> "in" <iter:TestList> ":" <body:Suite> <s2:("else" ":" Suite)?> => {
let end_location = if let Some(ref s) = s2 { let end_location = s2
s.2.last().unwrap().end_location.unwrap() .as_ref()
} else { .map(|s| s.2.last().unwrap().end_location)
body.last().unwrap().end_location.unwrap() .unwrap_or_else(|| body.last().unwrap().end_location)
}; .unwrap();
let orelse = s2.map(|s| s.2).unwrap_or_default(); let orelse = s2.map(|s| s.2).unwrap_or_default();
let target = Box::new(set_context(target, ast::ExprContext::Store)); let target = Box::new(set_context(target, ast::ExprContext::Store));
let iter = Box::new(iter); let iter = Box::new(iter);
@ -434,15 +429,11 @@ TryStatement: ast::Stmt = {
<location:@L> "try" ":" <body:Suite> <handlers:ExceptClause+> <else_suite:("else" ":" Suite)?> <finally:("finally" ":" Suite)?> <end_location:@R> => { <location:@L> "try" ":" <body:Suite> <handlers:ExceptClause+> <else_suite:("else" ":" Suite)?> <finally:("finally" ":" Suite)?> <end_location:@R> => {
let orelse = else_suite.map(|s| s.2).unwrap_or_default(); let orelse = else_suite.map(|s| s.2).unwrap_or_default();
let finalbody = finally.map(|s| s.2).unwrap_or_default(); let finalbody = finally.map(|s| s.2).unwrap_or_default();
let end_location = if let Some(last) = finalbody.last() { let end_location = finalbody
last.end_location .last()
} else { .map(|last| last.end_location)
if let Some(last) = orelse.last() { .or_else(|| orelse.last().map(|last| last.end_location))
last.end_location .unwrap_or_else(|| handlers.last().unwrap().end_location);
} else {
handlers.last().unwrap().end_location
}
};
ast::Stmt { ast::Stmt {
custom: (), custom: (),
location, location,