Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Python.asdl file to Python 3.13.2 #135

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ast/Python.asdl
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ module Python

type_ignore = TypeIgnore(int lineno, string tag)

type_param = TypeVar(identifier name, expr? bound)
| ParamSpec(identifier name)
| TypeVarTuple(identifier name)
type_param = TypeVar(identifier name, expr? bound, expr? default_value)
| ParamSpec(identifier name, expr? default_value)
| TypeVarTuple(identifier name, expr? default_value)
attributes (int lineno, int col_offset, int end_lineno, int end_col_offset)
}
41 changes: 35 additions & 6 deletions ast/src/gen/fold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2896,13 +2896,24 @@ pub fn fold_type_param_type_var<U, F: Fold<U> + ?Sized>(
#[allow(unused)] folder: &mut F,
node: TypeParamTypeVar<U>,
) -> Result<TypeParamTypeVar<F::TargetU>, F::Error> {
let TypeParamTypeVar { name, bound, range } = node;
let TypeParamTypeVar {
name,
bound,
default_value,
range,
} = node;
let context = folder.will_map_user(&range);

let name = Foldable::fold(name, folder)?;
let bound = Foldable::fold(bound, folder)?;
let default_value = Foldable::fold(default_value, folder)?;
let range = folder.map_user(range, context)?;
Ok(TypeParamTypeVar { name, bound, range })
Ok(TypeParamTypeVar {
name,
bound,
default_value,
range,
})
}
impl<T, U> Foldable<T, U> for TypeParamParamSpec<T> {
type Mapped = TypeParamParamSpec<U>;
Expand All @@ -2917,12 +2928,21 @@ pub fn fold_type_param_param_spec<U, F: Fold<U> + ?Sized>(
#[allow(unused)] folder: &mut F,
node: TypeParamParamSpec<U>,
) -> Result<TypeParamParamSpec<F::TargetU>, F::Error> {
let TypeParamParamSpec { name, range } = node;
let TypeParamParamSpec {
name,
default_value,
range,
} = node;
let context = folder.will_map_user(&range);

let name = Foldable::fold(name, folder)?;
let default_value = Foldable::fold(default_value, folder)?;
let range = folder.map_user(range, context)?;
Ok(TypeParamParamSpec { name, range })
Ok(TypeParamParamSpec {
name,
default_value,
range,
})
}
impl<T, U> Foldable<T, U> for TypeParamTypeVarTuple<T> {
type Mapped = TypeParamTypeVarTuple<U>;
Expand All @@ -2937,12 +2957,21 @@ pub fn fold_type_param_type_var_tuple<U, F: Fold<U> + ?Sized>(
#[allow(unused)] folder: &mut F,
node: TypeParamTypeVarTuple<U>,
) -> Result<TypeParamTypeVarTuple<F::TargetU>, F::Error> {
let TypeParamTypeVarTuple { name, range } = node;
let TypeParamTypeVarTuple {
name,
default_value,
range,
} = node;
let context = folder.will_map_user(&range);

let name = Foldable::fold(name, folder)?;
let default_value = Foldable::fold(default_value, folder)?;
let range = folder.map_user(range, context)?;
Ok(TypeParamTypeVarTuple { name, range })
Ok(TypeParamTypeVarTuple {
name,
default_value,
range,
})
}
impl<T, U> Foldable<T, U> for ArgWithDefault<T> {
type Mapped = ArgWithDefault<U>;
Expand Down
12 changes: 8 additions & 4 deletions ast/src/gen/generic.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// File automatically generated by ast/asdl_rs.py.

use crate::text_size::TextRange;
#[derive(Clone, Debug, PartialEq, is_macro::Is)]
#[derive(Clone, Debug, PartialEq)]
#[derive(is_macro::Is)]
pub enum Ast<R = TextRange> {
#[is(name = "module")]
Mod(Mod<R>),
Expand Down Expand Up @@ -3131,11 +3132,12 @@ pub struct TypeParamTypeVar<R = TextRange> {
pub range: R,
pub name: Identifier,
pub bound: Option<Box<Expr<R>>>,
pub default_value: Option<Box<Expr<R>>>,
}

impl<R> Node for TypeParamTypeVar<R> {
const NAME: &'static str = "TypeVar";
const FIELD_NAMES: &'static [&'static str] = &["name", "bound"];
const FIELD_NAMES: &'static [&'static str] = &["name", "bound", "default_value"];
}
impl<R> From<TypeParamTypeVar<R>> for TypeParam<R> {
fn from(payload: TypeParamTypeVar<R>) -> Self {
Expand All @@ -3153,11 +3155,12 @@ impl<R> From<TypeParamTypeVar<R>> for Ast<R> {
pub struct TypeParamParamSpec<R = TextRange> {
pub range: R,
pub name: Identifier,
pub default_value: Option<Box<Expr<R>>>,
}

impl<R> Node for TypeParamParamSpec<R> {
const NAME: &'static str = "ParamSpec";
const FIELD_NAMES: &'static [&'static str] = &["name"];
const FIELD_NAMES: &'static [&'static str] = &["name", "default_value"];
}
impl<R> From<TypeParamParamSpec<R>> for TypeParam<R> {
fn from(payload: TypeParamParamSpec<R>) -> Self {
Expand All @@ -3175,11 +3178,12 @@ impl<R> From<TypeParamParamSpec<R>> for Ast<R> {
pub struct TypeParamTypeVarTuple<R = TextRange> {
pub range: R,
pub name: Identifier,
pub default_value: Option<Box<Expr<R>>>,
}

impl<R> Node for TypeParamTypeVarTuple<R> {
const NAME: &'static str = "TypeVarTuple";
const FIELD_NAMES: &'static [&'static str] = &["name"];
const FIELD_NAMES: &'static [&'static str] = &["name", "default_value"];
}
impl<R> From<TypeParamTypeVarTuple<R>> for TypeParam<R> {
fn from(payload: TypeParamTypeVarTuple<R>) -> Self {
Expand Down
15 changes: 13 additions & 2 deletions ast/src/gen/visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -853,13 +853,24 @@ pub trait Visitor<R = crate::text_size::TextRange> {
if let Some(value) = node.bound {
self.visit_expr(*value);
}
if let Some(value) = node.default_value {
self.visit_expr(*value);
}
}
fn visit_type_param_param_spec(&mut self, node: TypeParamParamSpec<R>) {
self.generic_visit_type_param_param_spec(node)
}
fn generic_visit_type_param_param_spec(&mut self, node: TypeParamParamSpec<R>) {}
fn generic_visit_type_param_param_spec(&mut self, node: TypeParamParamSpec<R>) {
if let Some(value) = node.default_value {
self.visit_expr(*value);
}
}
fn visit_type_param_type_var_tuple(&mut self, node: TypeParamTypeVarTuple<R>) {
self.generic_visit_type_param_type_var_tuple(node)
}
fn generic_visit_type_param_type_var_tuple(&mut self, node: TypeParamTypeVarTuple<R>) {}
fn generic_visit_type_param_type_var_tuple(&mut self, node: TypeParamTypeVarTuple<R>) {
if let Some(value) = node.default_value {
self.visit_expr(*value);
}
}
}
12 changes: 6 additions & 6 deletions parser/src/python.lalrpop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,19 +1174,19 @@ TypeParamList: Vec<ast::TypeParam> = {
};

TypeParam: ast::TypeParam = {
<location:@L> <name:Identifier> <bound:(":" <Test<"all">>)?> <end_location:@R> => {
<location:@L> <name:Identifier> <bound:(":" <Test<"all">>)?> <default:("=" <Test<"all">>)?> <end_location:@R> => {
ast::TypeParam::TypeVar(
ast::TypeParamTypeVar { name, bound: bound.map(Box::new), range: (location..end_location).into() }
ast::TypeParamTypeVar { name, bound: bound.map(Box::new), default_value: default.map(Box::new), range: (location..end_location).into() }
)
},
<location:@L> "*" <name:Identifier> <end_location:@R> => {
<location:@L> "*" <name:Identifier> <default:("=" <Test<"all">>)?> <end_location:@R> => {
ast::TypeParam::TypeVarTuple(
ast::TypeParamTypeVarTuple { name, range: (location..end_location).into() }
ast::TypeParamTypeVarTuple { name, default_value: default.map(Box::new), range: (location..end_location).into() }
)
},
<location:@L> "**" <name:Identifier> <end_location:@R> => {
<location:@L> "**" <name:Identifier> <default:("=" <Test<"all">>)?> <end_location:@R> => {
ast::TypeParam::ParamSpec(
ast::TypeParamParamSpec { name, range: (location..end_location).into() }
ast::TypeParamParamSpec { name, default_value: default.map(Box::new), range: (location..end_location).into() }
)
}
};
Expand Down
Loading