Add RustPython runtime AST fields (#2)

Assisted-by: Codex:GPT-5

Author: youknowone

Cargo.lock

@@ -15,6 +15,7 @@ license = { workspace = true }
 ignored = ["ruff_cache"]
 
 [lib]
+name = "ruff_python_ast"
 
 [dependencies]
 # ruff_cache = { workspace = true, optional = true }
@@ -42,14 +43,13 @@ thin-vec = { workspace = true }
 [features]
 schemars = ["dep:schemars", "dep:serde_json"]
 # cache = ["dep:ruff_cache", "dep:ruff_macros"]
-# serde = [
-#     "dep:serde",
-#     "ruff_text_size/serde",
-#     "dep:ruff_cache",
-#     "char_str/serde",
-#     "compact_str/serde",
-#     "thin-vec/serde",
-# ]
+serde = [
+    "dep:serde",
+    "ruff_text_size/serde",
+    "char_str/serde",
+    "compact_str/serde",
+    "thin-vec/serde",
+]
 get-size = ["dep:get-size2", "char_str/get-size", "ruff_text_size/get-size"]
 salsa = ["dep:salsa"]
 

crates/ruff_python_ast/Cargo.toml

@@ -69,7 +69,10 @@ doc = "See also [mod](https://docs.python.org/3/library/ast.html#ast.mod)"
 
 [Mod.nodes.ModModule]
 doc = "See also [Module](https://docs.python.org/3/library/ast.html#ast.Module)"
-fields = [{ name = "body", type = "ThinVec<Stmt>" }]
+fields = [
+  { name = "body", type = "ThinVec<Stmt>" },
+  { name = "runtime_body", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
+]
 
 [Mod.nodes.ModExpression]
 doc = "See also [Module](https://docs.python.org/3/library/ast.html#ast.Module)"
@@ -93,6 +96,10 @@ fields = [
   { name = "parameters", type = "Box<crate::Parameters>" },
   { name = "returns", type = "Expr?", is_annotation = true },
   { name = "body", type = "ThinVec<Stmt>" },
+  { name = "runtime_decorator_list", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+  { name = "runtime_type_comment", type = "Box<str>?", skip_visit = true },
+  { name = "runtime_type_comment_bytes", type = "Vec<u8>?", skip_visit = true },
+  { name = "runtime_body", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtClassDef]
@@ -103,6 +110,8 @@ fields = [
   { name = "type_params", type = "Box<crate::TypeParams>?" },
   { name = "arguments", type = "Box<crate::Arguments>?" },
   { name = "body", type = "ThinVec<Stmt>" },
+  { name = "runtime_decorator_list", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+  { name = "runtime_body", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtReturn]
@@ -111,7 +120,10 @@ fields = [{ name = "value", type = "Expr?" }]
 
 [Stmt.nodes.StmtDelete]
 doc = "See also [Delete](https://docs.python.org/3/library/ast.html#ast.Delete)"
-fields = [{ name = "targets", type = "Expr*" }]
+fields = [
+  { name = "targets", type = "Expr*" },
+  { name = "runtime_targets", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+]
 
 [Stmt.nodes.StmtTypeAlias]
 doc = "See also [TypeAlias](https://docs.python.org/3/library/ast.html#ast.TypeAlias)"
@@ -126,6 +138,9 @@ doc = "See also [Assign](https://docs.python.org/3/library/ast.html#ast.Assign)"
 fields = [
   { name = "targets", type = "Expr*" },
   { name = "value", type = "Expr" },
+  { name = "runtime_targets", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+  { name = "runtime_type_comment", type = "Box<str>?", skip_visit = true },
+  { name = "runtime_type_comment_bytes", type = "Vec<u8>?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtAugAssign]
@@ -143,6 +158,7 @@ fields = [
   { name = "annotation", type = "Expr", is_annotation = true },
   { name = "value", type = "Expr?" },
   { name = "simple", type = "bool" },
+  { name = "runtime_simple", type = "i32?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtFor]
@@ -156,6 +172,10 @@ fields = [
   { name = "iter", type = "Expr" },
   { name = "body", type = "ThinVec<Stmt>" },
   { name = "orelse", type = "ThinVec<Stmt>" },
+  { name = "runtime_type_comment", type = "Box<str>?", skip_visit = true },
+  { name = "runtime_type_comment_bytes", type = "Vec<u8>?", skip_visit = true },
+  { name = "runtime_body", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
+  { name = "runtime_orelse", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtWhile]
@@ -165,6 +185,8 @@ fields = [
   { name = "test", type = "Expr" },
   { name = "body", type = "ThinVec<Stmt>" },
   { name = "orelse", type = "ThinVec<Stmt>" },
+  { name = "runtime_body", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
+  { name = "runtime_orelse", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtIf]
@@ -174,6 +196,7 @@ fields = [
   { name = "test", type = "Expr" },
   { name = "body", type = "ThinVec<Stmt>" },
   { name = "elif_else_clauses", type = "ElifElseClause*" },
+  { name = "runtime_body", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtWith]
@@ -185,6 +208,9 @@ fields = [
   { name = "is_async", type = "bool" },
   { name = "items", type = "WithItem*" },
   { name = "body", type = "ThinVec<Stmt>" },
+  { name = "runtime_type_comment", type = "Box<str>?", skip_visit = true },
+  { name = "runtime_type_comment_bytes", type = "Vec<u8>?", skip_visit = true },
+  { name = "runtime_body", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtMatch]
@@ -207,6 +233,10 @@ fields = [
   { name = "orelse", type = "ThinVec<Stmt>" },
   { name = "finalbody", type = "ThinVec<Stmt>" },
   { name = "is_star", type = "bool" },
+  { name = "runtime_body", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
+  { name = "runtime_handlers", type = "Vec<Option<crate::ExceptHandler>>?", skip_visit = true },
+  { name = "runtime_orelse", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
+  { name = "runtime_finalbody", type = "Vec<Option<crate::Stmt>>?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtAssert]
@@ -227,6 +257,7 @@ fields = [
   { name = "names", type = "Alias*" },
   { name = "level", type = "u32" },
   { name = "is_lazy", type = "bool" },
+  { name = "runtime_level", type = "i32?", skip_visit = true },
 ]
 
 [Stmt.nodes.StmtGlobal]
@@ -321,7 +352,11 @@ doc = "See also [expr](https://docs.python.org/3/library/ast.html#ast.expr)"
 
 [Expr.nodes.ExprBoolOp]
 doc = "See also [BoolOp](https://docs.python.org/3/library/ast.html#ast.BoolOp)"
-fields = [{ name = "op", type = "BoolOp" }, { name = "values", type = "Expr*" }]
+fields = [
+  { name = "op", type = "BoolOp" },
+  { name = "values", type = "Expr*" },
+  { name = "runtime_values", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+]
 custom_source_order = true
 
 [Expr.nodes.ExprNamed]
@@ -361,12 +396,18 @@ source_order = ["body", "test", "orelse"]
 
 [Expr.nodes.ExprDict]
 doc = "See also [Dict](https://docs.python.org/3/library/ast.html#ast.Dict)"
-fields = [{ name = "items", type = "DictItem*" }]
+fields = [
+  { name = "items", type = "DictItem*" },
+  { name = "runtime_values", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+]
 custom_source_order = true
 
 [Expr.nodes.ExprSet]
 doc = "See also [Set](https://docs.python.org/3/library/ast.html#ast.Set)"
-fields = [{ name = "elts", type = "Expr*" }]
+fields = [
+  { name = "elts", type = "Expr*" },
+  { name = "runtime_elts", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+]
 
 [Expr.nodes.ExprListComp]
 doc = "See also [ListComp](https://docs.python.org/3/library/ast.html#ast.ListComp)"
@@ -416,6 +457,7 @@ fields = [
   { name = "left", type = "Expr" },
   { name = "ops", type = "Box<[CmpOp]>" },
   { name = "comparators", type = "Box<[Expr]>" },
+  { name = "runtime_comparators", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
 ]
 # The fields must be visited simultaneously
 custom_source_order = true
@@ -444,7 +486,11 @@ doesn't join the implicitly concatenated parts into a single string. Instead,
 it keeps them separate and provide various methods to access the parts.
 
 See also [JoinedStr](https://docs.python.org/3/library/ast.html#ast.JoinedStr)"""
-fields = [{ name = "value", type = "FStringValue" }]
+fields = [
+  { name = "value", type = "FStringValue" },
+  { name = "runtime_joined_str", type = "Vec<crate::Expr>?", skip_visit = true },
+  { name = "runtime_values", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+]
 custom_source_order = true
 
 [Expr.nodes.ExprTString]
@@ -456,7 +502,11 @@ doesn't join the implicitly concatenated parts into a single string. Instead,
 it keeps them separate and provide various methods to access the parts.
 
 See also [TemplateStr](https://docs.python.org/3/library/ast.html#ast.TemplateStr)"""
-fields = [{ name = "value", type = "TStringValue" }]
+fields = [
+  { name = "value", type = "TStringValue" },
+  { name = "runtime_template_str", type = "Vec<crate::Expr>?", skip_visit = true },
+  { name = "runtime_values", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+]
 custom_source_order = true
 
 [Expr.nodes.ExprStringLiteral]
@@ -488,6 +538,14 @@ derives = ["Default"]
 fields = []
 derives = ["Default"]
 
+[Expr.nodes.ExprConstant]
+doc = "See also [Constant](https://docs.python.org/3/library/ast.html#ast.Constant)"
+fields = [
+  { name = "value", type = "ConstantValue", skip_visit = true },
+  { name = "kind", type = "Box<str>?", skip_visit = true },
+  { name = "invalid_type", type = "Box<str>?", skip_visit = true },
+]
+
 [Expr.nodes.ExprAttribute]
 doc = "See also [Attribute](https://docs.python.org/3/library/ast.html#ast.Attribute)"
 fields = [
@@ -523,6 +581,7 @@ doc = "See also [List](https://docs.python.org/3/library/ast.html#ast.List)"
 fields = [
   { name = "elts", type = "Expr*" },
   { name = "ctx", type = "ExprContext" },
+  { name = "runtime_elts", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
 ]
 
 [Expr.nodes.ExprTuple]
@@ -531,6 +590,7 @@ fields = [
   { name = "elts", type = "Expr*" },
   { name = "ctx", type = "ExprContext" },
   { name = "parenthesized", type = "bool" },
+  { name = "runtime_elts", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
 ]
 
 [Expr.nodes.ExprSlice]
@@ -583,14 +643,19 @@ fields = [{ name = "value", type = "Singleton" }]
 
 [Pattern.nodes.PatternMatchSequence]
 doc = "See also [MatchSequence](https://docs.python.org/3/library/ast.html#ast.MatchSequence)"
-fields = [{ name = "patterns", type = "Pattern*" }]
+fields = [
+  { name = "patterns", type = "Pattern*" },
+  { name = "runtime_patterns", type = "Vec<Option<crate::Pattern>>?", skip_visit = true },
+]
 
 [Pattern.nodes.PatternMatchMapping]
 doc = "See also [MatchMapping](https://docs.python.org/3/library/ast.html#ast.MatchMapping)"
 fields = [
   { name = "keys", type = "ThinVec<Expr>" },
   { name = "patterns", type = "ThinVec<Pattern>" },
   { name = "rest", type = "Identifier?" },
+  { name = "runtime_keys", type = "Vec<Option<crate::Expr>>?", skip_visit = true },
+  { name = "runtime_patterns", type = "Vec<Option<crate::Pattern>>?", skip_visit = true },
 ]
 custom_source_order = true
 
@@ -599,6 +664,9 @@ doc = "See also [MatchClass](https://docs.python.org/3/library/ast.html#ast.Matc
 fields = [
   { name = "cls", type = "Box<Expr>" },
   { name = "arguments", type = "PatternArguments" },
+  { name = "runtime_patterns", type = "Vec<Option<crate::Pattern>>?", skip_visit = true },
+  { name = "runtime_kwd_attrs", type = "Vec<crate::Identifier>?", skip_visit = true },
+  { name = "runtime_kwd_patterns", type = "Vec<Option<crate::Pattern>>?", skip_visit = true },
 ]
 
 [Pattern.nodes.PatternMatchStar]
@@ -614,7 +682,10 @@ fields = [
 
 [Pattern.nodes.PatternMatchOr]
 doc = "See also [MatchOr](https://docs.python.org/3/library/ast.html#ast.MatchOr)"
-fields = [{ name = "patterns", type = "Pattern*" }]
+fields = [
+  { name = "patterns", type = "Pattern*" },
+  { name = "runtime_patterns", type = "Vec<Option<crate::Pattern>>?", skip_visit = true },
+]
 
 [TypeParam]
 doc = "See also [type_param](https://docs.python.org/3/library/ast.html#ast.type_param)"

crates/ruff_python_ast/ast.toml

@@ -44,6 +44,7 @@
     "Alias",
     "Singleton",
     "PatternArguments",
+    "ConstantValue",
 }
 
 
@@ -276,10 +277,10 @@ def __init__(self, rule: str) -> None:
             rule = rule[:-1]
 
         self.sequence_kind, self.name = split_sequence_type(rule)
-        if self.optional and self.sequence_kind is not None:
+        if self.optional and self.sequence_kind is not None and "<" not in rule:
             raise ValueError(f"optional field cannot be sequence or slice: {self.rule}")
         if self.sequence_kind is not None and (
-            not self.name or any(ch in self.name for ch in "?*&[]<>")
+            not self.name or any(ch in self.name for ch in "?*&[]")
         ):
             raise ValueError(f"Invalid collection element type: {rule}")