mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-04 10:48:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename parser goal 'All' to 'all' (#6867)

Browse source
This commit is contained in:
Micha Reiser 2023-08-25 14:00:57 +02:00 • committed by GitHub
parent 0b6dab5e3f
commit 15b7525464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31009 additions and 36127 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ruff_python_parser/src/python.lalrpop
View file

@ -372,7 +372,7 @@ IpyHelpEndEscapeCommandStatement: ast::Stmt = {
// We are permissive than the original implementation because we would allow whitespace // We are permissive than the original implementation because we would allow whitespace
// between the expression and the suffix while the IPython implementation doesn't allow it. // between the expression and the suffix while the IPython implementation doesn't allow it.
// For example, `foo ?` would be valid in our case but invalid from IPython. // For example, `foo ?` would be valid in our case but invalid from IPython.
<location:@L> <e:Expression<"All">> <suffix:("?")+> <end_location:@R> =>? { <location:@L> <e:Expression<"all">> <suffix:("?")+> <end_location:@R> =>? {
fn unparse_expr(expr: &ast::Expr, buffer: &mut String) -> Result<(), LexicalError> { fn unparse_expr(expr: &ast::Expr, buffer: &mut String) -> Result<(), LexicalError> {
match expr { match expr {
ast::Expr::Name(ast::ExprName { id, .. }) => { ast::Expr::Name(ast::ExprName { id, .. }) => {
@ -1054,7 +1054,7 @@ WithStatement: ast::Stmt = {
WithItems: Vec<ast::WithItem> = { WithItems: Vec<ast::WithItem> = {
"(" <WithItemsNoAs> ","? ")", "(" <WithItemsNoAs> ","? ")",
"(" <left:(<WithItemsNoAs> ",")?> <mid:WithItem<"as">> <right:("," <WithItem<"all">>)*> ","? ")" => { "(" <left:(<WithItemsNoAs> ",")?> <mid:WithItemAs> <right:("," <WithItem<"all">>)*> ","? ")" => {
left.into_iter().flatten().chain([mid]).chain(right).collect() left.into_iter().flatten().chain([mid]).chain(right).collect()
}, },
<WithItem<"no-withitems">> => vec![<>], <WithItem<"no-withitems">> => vec![<>],
@ -1071,12 +1071,16 @@ WithItemsNoAs: Vec<ast::WithItem> = {
} }
WithItem<Goal>: ast::WithItem = { WithItem<Goal>: ast::WithItem = {
<location:@L> <context_expr: Test<Goal>> <end_location:@R> if Goal != "as" => ast::WithItem { context_expr, optional_vars: None, range: (location..end_location).into() }, <location:@L> <context_expr: Test<Goal>> <end_location:@R> => ast::WithItem { context_expr, optional_vars: None, range: (location..end_location).into() },
<WithItemAs>,
};
WithItemAs: ast::WithItem = {
<location:@L> <context_expr:Test<"all">> "as" <vars:Expression<"all">> <end_location:@R> => { <location:@L> <context_expr:Test<"all">> "as" <vars:Expression<"all">> <end_location:@R> => {
let optional_vars = Some(Box::new(set_context(vars, ast::ExprContext::Store))); 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: (location..end_location).into() }
}, },
}; }
FuncDef: ast::Stmt = { FuncDef: ast::Stmt = {
<location:@L> <decorator_list:Decorator*> <is_async:"async"?> "def" <name:Identifier> <type_params:TypeParams?> <args:Parameters> <r:("->" <Test<"all">>)?> ":" <body:Suite> => { <location:@L> <decorator_list:Decorator*> <is_async:"async"?> "def" <name:Identifier> <type_params:TypeParams?> <args:Parameters> <r:("->" <Test<"all">>)?> ":" <body:Suite> => {

67124
crates/ruff_python_parser/src/python.rs
View file

File diff suppressed because it is too large Load diff