Remove visit_arg_with_default (#5265)

## Summary

This is a follow up to #5221. Turns out it was easy to restructure the
visitor to get the right order, I'm just dumb 🤷‍♂️ I've
removed `visit_arg_with_default` entirely from the `Visitor`, although
it still exists as part of `preorder::Visitor`.
This commit is contained in:
James Berry 2023-06-21 16:00:24 -04:00 committed by GitHub
parent 62e2c46f98
commit f194572be8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 17 deletions

View File

@ -2,7 +2,7 @@
pub mod preorder; pub mod preorder;
use rustpython_ast::{ArgWithDefault, Decorator}; use rustpython_ast::Decorator;
use rustpython_parser::ast::{ use rustpython_parser::ast::{
self, Alias, Arg, Arguments, BoolOp, CmpOp, Comprehension, Constant, ExceptHandler, Expr, self, Alias, Arg, Arguments, BoolOp, CmpOp, Comprehension, Constant, ExceptHandler, Expr,
ExprContext, Keyword, MatchCase, Operator, Pattern, Stmt, UnaryOp, WithItem, ExprContext, Keyword, MatchCase, Operator, Pattern, Stmt, UnaryOp, WithItem,
@ -61,9 +61,6 @@ pub trait Visitor<'a> {
fn visit_arg(&mut self, arg: &'a Arg) { fn visit_arg(&mut self, arg: &'a Arg) {
walk_arg(self, arg); walk_arg(self, arg);
} }
fn visit_arg_with_default(&mut self, arg_with_default: &'a ArgWithDefault) {
walk_arg_with_default(self, arg_with_default);
}
fn visit_keyword(&mut self, keyword: &'a Keyword) { fn visit_keyword(&mut self, keyword: &'a Keyword) {
walk_keyword(self, keyword); walk_keyword(self, keyword);
} }
@ -606,17 +603,34 @@ pub fn walk_except_handler<'a, V: Visitor<'a> + ?Sized>(
} }
pub fn walk_arguments<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, arguments: &'a Arguments) { pub fn walk_arguments<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, arguments: &'a Arguments) {
// Defaults are evaluated before annotations.
for arg in &arguments.posonlyargs { for arg in &arguments.posonlyargs {
visitor.visit_arg_with_default(arg); if let Some(default) = &arg.default {
visitor.visit_expr(default);
}
} }
for arg in &arguments.args { for arg in &arguments.args {
visitor.visit_arg_with_default(arg); if let Some(default) = &arg.default {
visitor.visit_expr(default);
}
}
for arg in &arguments.kwonlyargs {
if let Some(default) = &arg.default {
visitor.visit_expr(default);
}
}
for arg in &arguments.posonlyargs {
visitor.visit_arg(&arg.def);
}
for arg in &arguments.args {
visitor.visit_arg(&arg.def);
} }
if let Some(arg) = &arguments.vararg { if let Some(arg) = &arguments.vararg {
visitor.visit_arg(arg); visitor.visit_arg(arg);
} }
for arg in &arguments.kwonlyargs { for arg in &arguments.kwonlyargs {
visitor.visit_arg_with_default(arg); visitor.visit_arg(&arg.def);
} }
if let Some(arg) = &arguments.kwarg { if let Some(arg) = &arguments.kwarg {
visitor.visit_arg(arg); visitor.visit_arg(arg);
@ -629,16 +643,6 @@ pub fn walk_arg<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, arg: &'a Arg) {
} }
} }
pub fn walk_arg_with_default<'a, V: Visitor<'a> + ?Sized>(
visitor: &mut V,
arg_with_default: &'a ArgWithDefault,
) {
if let Some(expr) = &arg_with_default.default {
visitor.visit_expr(expr);
}
visitor.visit_arg(&arg_with_default.def);
}
pub fn walk_keyword<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, keyword: &'a Keyword) { pub fn walk_keyword<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, keyword: &'a Keyword) {
visitor.visit_expr(&keyword.value); visitor.visit_expr(&keyword.value);
} }