NotificationsYou must be signed in to change notification settings
Fork1.9k
Star9k

Commitca6c054

committed

Rust: RenameAdt class and lift common predicates to it

1 parent22bc924 commitca6c054Copy full SHA for ca6c054

File tree

4 files changed

+34

-11

lines changed

rust
- ast-generator/src
  - main.rs
- extractor/src/translate
  - base.rs
- schema
  - annotations.py
  - ast.py

4 files changed

+34

-11

lines changed

`‎rust/ast-generator/src/main.rs‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ use ungrammar::Grammar;`
`15`	`15`
`16`	`16`	`fnclass_name(type_name:&str) ->String{`
`17`	`17`	`match type_name{`
	`18`	`+"Adt" =>"TypeItem".to_owned(),`
`18`	`19`	`"BinExpr" =>"BinaryExpr".to_owned(),`
`19`	`20`	`"ElseBranch" =>"Expr".to_owned(),`
`20`	`21`	`"Fn" =>"Function".to_owned(),`

`‎rust/extractor/src/translate/base.rs‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ impl<'a> Translator<'a> {`
`674`	`674`	`pub(crate)fnemit_derive_expansion(`
`675`	`675`	`&mutself,`
`676`	`676`	`node:&(implInto<ast::Adt> +Clone),`
`677`		`-label:implInto<Label<generated::Adt>> +Copy,`
	`677`	`+label:implInto<Label<generated::TypeItem>> +Copy,`
`678`	`678`	`){`
`679`	`679`	`letSome(semantics) =self.semanticselse{`
`680`	`680`	`return;`
`@@ -686,7 +686,7 @@ impl<'a> Translator<'a> {`
`686`	`686`	`.flatten()`
`687`	`687`	`.filter_map(\|expanded\|self.process_item_macro_expansion(&node, expanded))`
`688`	`688`	`.collect::<Vec<_>>();`
`689`		`- generated::Adt::emit_derive_macro_expansions(`
	`689`	`+ generated::TypeItem::emit_derive_macro_expansions(`
`690`	`690`	`label.into(),`
`691`	`691`	`expansions,`
`692`	`692`	`&mutself.trap.writer,`

`‎rust/schema/annotations.py‎`

Lines changed: 27 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,18 @@ class LoopingExpr(LabelableExpr):`
`18`	`18`	`loop_body:optional["BlockExpr"]\|child`
`19`	`19`
`20`	`20`
`21`		`-@annotate(Adt,replace_bases={AstNode:Item})`
	`21`	`+@annotate(TypeItem,replace_bases={AstNode:Item})`
`22`	`22`	`class_:`
`23`	`23`	`"""`
`24`		- AnADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
	`24`	+ Anitem that defines a type. Either a `Struct`, `Enum`, or `Union`.
`25`	`25`	`"""`
`26`	`26`
`27`	`27`	`derive_macro_expansions:list[MacroItems]\|child\|rust.detach`
	`28`	`+attrs:list["Attr"]\|child`
	`29`	`+generic_param_list:optional["GenericParamList"]\|child`
	`30`	`+name:optional["Name"]\|child`
	`31`	`+visibility:optional["Visibility"]\|child`
	`32`	`+where_clause:optional["WhereClause"]\|child`
`28`	`33`
`29`	`34`
`30`	`35`	`@annotate(Module)`
`@@ -1063,7 +1068,7 @@ class _:`
`1063`	`1068`	`"""`
`1064`	`1069`
`1065`	`1070`
`1066`		`-@annotate(Enum,replace_bases={Item:None})# still an Item via Adt`
	`1071`	`+@annotate(Enum,replace_bases={Item:None})`
`1067`	`1072`	`class_:`
`1068`	`1073`	`"""`
`1069`	`1074`	`An enum declaration.`
`@@ -1074,6 +1079,12 @@ class _:`
`1074`	`1079`	```
`1075`	`1080`	`"""`
`1076`	`1081`
	`1082`	`+attrs:drop`
	`1083`	`+generic_param_list:drop`
	`1084`	`+name:drop`
	`1085`	`+visibility:drop`
	`1086`	`+where_clause:drop`
	`1087`	`+`
`1077`	`1088`
`1078`	`1089`	`@annotate(ExternBlock)`
`1079`	`1090`	`class_:`
`@@ -1893,7 +1904,7 @@ class _:`
`1893`	`1904`	`)`
`1894`	`1905`
`1895`	`1906`
`1896`		`-@annotate(Struct,replace_bases={Item:None})# still an Item via Adt`
	`1907`	`+@annotate(Struct,replace_bases={Item:None})`
`1897`	`1908`	`class_:`
`1898`	`1909`	`"""`
`1899`	`1910`	`A Struct. For example:`
`@@ -1906,6 +1917,11 @@ class _:`
`1906`	`1917`	`"""`
`1907`	`1918`
`1908`	`1919`	`field_list:_\|ql.db_table_name("struct_field_lists_")`
	`1920`	`+attrs:drop`
	`1921`	`+generic_param_list:drop`
	`1922`	`+name:drop`
	`1923`	`+visibility:drop`
	`1924`	`+where_clause:drop`
`1909`	`1925`
`1910`	`1926`
`1911`	`1927`	`@annotate(TokenTree)`
`@@ -2075,7 +2091,7 @@ class _:`
`2075`	`2091`	`"""`
`2076`	`2092`
`2077`	`2093`
`2078`		`-@annotate(Union,replace_bases={Item:None})# still an Item via Adt`
	`2094`	`+@annotate(Union,replace_bases={Item:None})`
`2079`	`2095`	`class_:`
`2080`	`2096`	`"""`
`2081`	`2097`	`A union declaration.`
`@@ -2086,6 +2102,12 @@ class _:`
`2086`	`2102`	```
`2087`	`2103`	`"""`
`2088`	`2104`
	`2105`	`+attrs:drop`
	`2106`	`+generic_param_list:drop`
	`2107`	`+name:drop`
	`2108`	`+visibility:drop`
	`2109`	`+where_clause:drop`
	`2110`	`+`
`2089`	`2111`
`2090`	`2112`	`@annotate(Use)`
`2091`	`2113`	`class_:`

`‎rust/schema/ast.py‎`

Lines changed: 4 additions & 4 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitca6c054

File tree

4 files changed

4 files changed

`‎rust/ast-generator/src/main.rs‎`

`‎rust/extractor/src/translate/base.rs‎`

`‎rust/schema/annotations.py‎`

`‎rust/schema/ast.py‎`

0 commit comments