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
Next Next commit
DRAFT: Initial macro for pyast code depulication
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jul 2, 2025
commit 2682cce4ca0df80bb12a6d3ddfbd7b038e02baee
203 changes: 79 additions & 124 deletions 203 vm/src/stdlib/ast/pyast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,138 +2,93 @@

use super::*;
use crate::common::ascii;

macro_rules! impl_node {
(
$(#[$meta:meta])*
$vis:vis struct $name:ident,
[$($field:expr),* $(,)?],
[$($attr:expr),* $(,)?]
) => {
$(#[$meta])*
$vis struct $name;

#[pyclass(flags(HAS_DICT, BASETYPE))]
impl $name {
#[extend_class]
fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) {
class.set_attr(
identifier!(ctx, _fields),
ctx.new_tuple(vec![
$(
ctx.new_str(ascii!($field)).into()
),*
]).into(),
);

class.set_attr(
identifier!(ctx, _attributes),
ctx.new_list(vec![
$(
ctx.new_str(ascii!($attr)).into()
),*
]).into(),
);
}
}
};
}

#[pyclass(module = "_ast", name = "mod", base = "NodeAst")]
pub(crate) struct NodeMod;

#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeMod {}
#[pyclass(module = "_ast", name = "Module", base = "NodeMod")]
pub(crate) struct NodeModModule;
#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeModModule {
#[extend_class]
fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) {
class.set_attr(
identifier!(ctx, _fields),
ctx.new_tuple(vec![
ctx.new_str(ascii!("body")).into(),
ctx.new_str(ascii!("type_ignores")).into(),
])
.into(),
);
class.set_attr(identifier!(ctx, _attributes), ctx.new_list(vec![]).into());
}
}
#[pyclass(module = "_ast", name = "Interactive", base = "NodeMod")]
pub(crate) struct NodeModInteractive;
#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeModInteractive {
#[extend_class]
fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) {
class.set_attr(
identifier!(ctx, _fields),
ctx.new_tuple(vec![ctx.new_str(ascii!("body")).into()])
.into(),
);
class.set_attr(identifier!(ctx, _attributes), ctx.new_list(vec![]).into());
}
}
#[pyclass(module = "_ast", name = "Expression", base = "NodeMod")]
pub(crate) struct NodeModExpression;
#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeModExpression {
#[extend_class]
fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) {
class.set_attr(
identifier!(ctx, _fields),
ctx.new_tuple(vec![ctx.new_str(ascii!("body")).into()])
.into(),
) 10000 ;
class.set_attr(identifier!(ctx, _attributes), ctx.new_list(vec![]).into());
}
}
#[pyclass(module = "_ast", name = "FunctionType", base = "NodeMod")]
pub(crate) struct NodeModFunctionType;
#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeModFunctionType {
#[extend_class]
fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) {
class.set_attr(
identifier!(ctx, _fields),
ctx.new_tuple(vec![
ctx.new_str(ascii!("argtypes")).into(),
ctx.new_str(ascii!("returns")).into(),
])
.into(),
);
class.set_attr(identifier!(ctx, _attributes), ctx.new_list(vec![]).into());
}
}

impl_node!(
#[pyclass(module = "_ast", name = "Module", base = "NodeMod")]
pub(crate) struct NodeModModule,
["body", "type_ignores"], []
);

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

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

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

#[pyclass(module = "_ast", name = "stmt", base = "NodeAst")]
pub(crate) struct NodeStmt;

#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeStmt {}
#[pyclass(module = "_ast", name = "FunctionDef", base = "NodeStmt")]
pub(crate) struct NodeStmtFunctionDef;
#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeStmtFunctionDef {
#[extend_class]
fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) {
class.set_attr(
identifier!(ctx, _fields),
ctx.new_tuple(vec![
ctx.new_str(ascii!("name")).into(),
ctx.new_str(ascii!("args")).into(),
ctx.new_str(ascii!("body")).into(),
ctx.new_str(ascii!("decorator_list")).into(),
ctx.new_str(ascii!("returns")).into(),
ctx.new_str(ascii!("type_comment")).into(),
ctx.new_str(ascii!("type_params")).into(),
])
.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(),
);
}
}
#[pyclass(module = "_ast", name = "AsyncFunctionDef", base = "NodeStmt")]
pub(crate) struct NodeStmtAsyncFunctionDef;
#[pyclass(flags(HAS_DICT, BASETYPE))]
impl NodeStmtAsyncFunctionDef {
#[extend_class]
fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) {
class.set_attr(
identifier!(ctx, _fields),
ctx.new_tuple(vec![
ctx.new_str(ascii!("name")).into(),
ctx.new_str(ascii!("args")).into(),
ctx.new_str(ascii!("body")).into(),
ctx.new_str(ascii!("decorator_list")).into(),
ctx.new_str(ascii!("returns")).into(),
ctx.new_str(ascii!("type_comment")).into(),
ctx.new_str(ascii!("type_params")).into(),
])
.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 = "FunctionDef", base = "NodeStmt")]
< 82D4 /td> pub(crate) struct NodeStmtFunctionDef,
["name", "args", "body", "decorator_list", "returns", "type_comment", "type_params"],
["lineo", "col_offset", "end_lineno", "end_col_offset"]

Check warning on line 82 in vm/src/stdlib/ast/pyast.rs

View workflow job for this annotation

GitHub Actions / Check Rust code with rustfmt and clippy 

Unknown word (lineo)
);

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

Check warning on line 89 in vm/src/stdlib/ast/pyast.rs

View workflow job for this annotation

GitHub Actions / Check Rust code with rustfmt and clippy 

Unknown word (lineo)
);

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