8000 macro for pyast code depulication by ShaharNaveh · Pull Request #5887 · RustPython/RustPython · GitHub
[go: up one dir, main page]
Skip to content

macro for pyast code depulication #5887

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jul 3, 2025
Merged

macro for pyast code depulication #5887

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2682cce
DRAFT: Initial macro for pyast code depulication
ShaharNaveh Jul 2, 2025
f3be4ee
Fix typo
ShaharNaveh Jul 2, 2025
104c956
Update vm/src/stdlib/ast/pyast.rs
ShaharNaveh Jul 3, 2025
ddd792d
Merge remote-tracking branch 'upstream/main' into cleanup-ast-pyast
ShaharNaveh Jul 3, 2025
61e635b
Add branches for with/out fields/attrs
ShaharNaveh Jul 3, 2025
95d5eae
Add macro branch for empty fields&attributes
ShaharNaveh Jul 3, 2025
563cb9a
Apply macro to all structs
ShaharNaveh Jul 3, 2025
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
Prev Previous commit
Next Next commit
Add branches for with/out fields/attrs
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jul 3, 2025
commit 61e635b4fcb138d713d34e486dbdc7914691c8c6
71 changes: 43 additions & 28 deletions vm/src/stdlib/ast/pyast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ macro_rules! impl_node {
$(#[$meta:meta])*
$vis:vis struct $name:ident,
fields: [$($field:expr),* $(,)?],
attributes: [$($attr:expr),* $(,)?]
attributes: [$($attr:expr),* $(,)?] $(,)?
) => {
$(#[$meta])*
$vis struct $name;
Expand Down Expand Up @@ -37,6 +37,33 @@ macro_rules! impl_node {
}
}
};
// Without attributes
(
$(#[$meta:meta])*
$vis:vis struct $name:ident,
fields: [$($field:expr),* $(,)?] $(,)?
) => {
impl_node!(
$(#[$meta])*
$vis struct $name,
fields: [$($field),*],
attributes: [],
);
};

// Without fields
(
$(#[$meta:meta])*
$vis:vis struct $name:ident,
attributes: [$($attr:expr),* $(,)?] $(,)?
) => {
impl_node!(
$(#[$meta])*
$vis struct $name,
fields: [],
attributes: [$($attr),*],
);
};
}

#[pyclass(module = "_ast", name = "mod", base = "NodeAst")]
Expand All @@ -48,25 +75,25 @@ impl NodeMod {}
impl_node!(
#[pyclass(module = "_ast", name = "Module", base = "NodeMod")]
pub(crate) struct NodeModModule,
["body", "type_ignores"], []
fields: ["body", "type_ignores"]
);

impl_node!(
#[pyclass(module = "_ast", name = "Interactive", base = "NodeMod")]
pub(crate) struct NodeModInteractive,
["body"], []
fields: ["body"],
);

impl_node!(
#[pyclass(module = "_ast", name = "Expression", base = "NodeMod")]
pub(crate) struct NodeModExpression,
["body"], []
fields: ["body"],
);

impl_node!(
#[pyclass(module = "_ast", name = "FunctionType", base = "NodeMod")]
pub(crate) struct NodeModFunctionType,
["argtypes", "returns"], []
fields: ["argtypes", "returns"],
);

#[pyclass(module = "_ast", name = "stmt", base = "NodeAst")]
Expand All @@ -78,15 +105,15 @@ impl NodeStmt {}
impl_node!(
#[pyclass(module = "_ast", name = "FunctionDef", base = "NodeStmt")]
pub(crate) struct NodeStmtFunctionDef,
["name", "args", "body", "decorator_list", "returns", "type_comment", "type_params"],
["lineno", "col_offset", "end_lineno", "end_col_offset"]
fields: ["name", "args", "body", "decorator_list", "returns", "type_comment", "type_params"],
attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"]
);

impl_node!(
#[pyclass(module = "_ast", name = "AsyncFunctionDef", base = "NodeStmt")]
pub(crate) struct NodeStmtAsyncFunctionDef,
["name", "args", "body", "decorator_list", "returns", "type_comment", "type_params"],
["lineno", "col_offset", "end_lineno", "end_col_offset"]
fields: ["name", "args", "body", "decorator_list", "returns", "type_comment", "type_params"],
attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"]
);

#[pyclass(module = "_ast", name = "ClassDef", base = "NodeStmt")]
Expand Down Expand Up @@ -712,25 +739,13 @@ impl NodeStmtPass {
);
}
}
#[pyclass(module = "_ast", name = "Break", base = "NodeStmt")]
pub(crate) struct NodeStmtBreak;
#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeStmtBreak {
#[extend_class]
fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) {
class.set_attr(identifier!(ctx, _fields), ctx.new_tuple(vec![]).into());
class.set_attr(
identifier!(ctx, _attributes),
ctx.new_list(vec![
ctx.new_str(ascii!("lineno")).into(),
ctx.new_str(ascii!("col_offset")).into(),
ctx.new_str(ascii!("end_lineno")).into(),
ctx.new_str(ascii!("end_col_offset")).into(),
])
.into(),
);
}
}

impl_node!(
#[pyclass(module = "_ast", name = "Break", base = "NodeStmt")]
pub(crate) struct NodeStmtBreak,
attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"],
);

#[pyclass(module = "_ast", name = "Continue", base = "NodeStmt")]
pub(crate) struct NodeStmtContinue;
#[pyclass(flags(HAS_DICT, BASETYPE))]
Expand Down
Loading
0