Commit 8395412

committed

[fix] レシーバを持つメソッドに対して callee を付与できるようにした

1 parent fe2c6ae commit 8395412Copy full SHA for 8395412

File tree

+33

-21

lines changed

+33

-21

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,11 @@ pub fn proc_macro_impl(_args: TokenStream, ast: ItemTrait) -> TokenStream {`
`16`	`16`	`#[macro_export]`
`17`	`17`	`macro_rules! #macro_ident {`
`18`	`18`	`($($body:tt)*) => {{`
`19`		`- // 文脈付き呼び出しへの変換`
	`19`	`+ // 文脈付き呼び出しへの変換 (関数定義ではなくブロックに変換される)`
`20`	`20`	`#[modifier_caller(#trait_name)]`
`21`	`21`	`fn __mymodifier_caller() {`
`22`	`22`	`$($body)*`
`23`	`23`	`}`
`24`		`-`
`25`		`- // 呼び出し`
`26`		`- __mymodifier_caller();`
`27`	`24`	`}};`
`28`	`25`	`}`
`29`	`26`	`}`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`use proc_macro2::TokenStream;`
`2`	`2`	`use quote::quote;`
`3`		`-use syn::ItemFn;`
	`3`	`+use syn::{FnArg,ItemFn};`
`4`	`4`
`5`	`5`	`/// 対象: 関数`
`6`	`6`	`/// 動作: 文脈への制約を追加`
`@@ -9,13 +9,21 @@ pub fn proc_macro_impl(args: TokenStream, ast: ItemFn) -> TokenStream {`
`9`	`9`
`10`	`10`	`let fn_visibility = ast.vis;`
`11`	`11`	`let fn_ident = ast.sig.ident;`
`12`		`- let fn_args = ast.sig.inputs;`
`13`	`12`	`let fn_ret_type = ast.sig.output;`
`14`	`13`	`let fn_body = ast.block;`
`15`	`14`
	`15`	`+ let fn_args = ast.sig.inputs;`
	`16`	`+ let fn_args = if let Some(FnArg::Receiver(..)) = fn_args.first() {`
	`17`	`+ let receiver = &fn_args[0];`
	`18`	`+ let remains = fn_args.iter().skip(1).collect::<Vec<_>>();`
	`19`	`+ quote! { #receiver, ctx: Ctx, #(#remains),*}`
	`20`	`+ } else {`
	`21`	`+ quote! { ctx: Ctx, #fn_args }`
	`22`	`+ };`
	`23`	`+`
`16`	`24`	`quote! {`
`17`	`25`	`// マクロ適用関数`
`18`		`- #fn_visibility fn #fn_ident <Ctx> (ctx:Ctx,#fn_args) #fn_ret_type`
	`26`	`+ #fn_visibility fn #fn_ident <Ctx> (#fn_args) #fn_ret_type`
`19`	`27`	`where`
`20`	`28`	`// 制約`
`21`	`29`	`Ctx: #target_trait,`

Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,26 +7,20 @@ use syn::{Expr, ItemFn, Stmt};`
`7`	`7`	`pub fn proc_macro_impl(args: TokenStream, ast: ItemFn) -> TokenStream {`
`8`	`8`	`let target_trait = args;`
`9`	`9`
`10`		`- let fn_visibility = ast.vis;`
`11`		`- let fn_ident = ast.sig.ident;`
`12`		`- let fn_ret_type = ast.sig.output;`
`13`		`- let fn_stmts = &ast`
	`10`	`+ let stmts = &ast`
`14`	`11`	`.block`
`15`	`12`	`.stmts`
`16`	`13`	`.iter()`
`17`	`14`	`.map(append_ctx_if_calling)`
`18`	`15`	`.collect::<Vec<_>>();`
`19`	`16`
`20`	`17`	`quote! {`
`21`		`- // マクロ適用関数`
`22`		`- #fn_visibility fn #fn_ident () #fn_ret_type {`
`23`		`- // 前準備`
`24`		`- #[allow(non_local_definitions)]`
`25`		`- impl #target_trait for Ctx {}`
	`18`	`+ // 前準備`
	`19`	`+ #[allow(non_local_definitions)]`
	`20`	`+ impl #target_trait for Ctx {}`
`26`	`21`
`27`		`- // 関数本体`
`28`		`- #(#fn_stmts);*`
`29`		`- }`
	`22`	`+ // 関数本体`
	`23`	`+ #(#stmts);*`
`30`	`24`	`}`
`31`	`25`	`}`
`32`	`26`
`@@ -36,6 +30,11 @@ fn append_ctx_if_calling(stmt: &Stmt) -> TokenStream {`
`36`	`30`	`let func = call.func.to_token_stream();`
`37`	`31`	`let args = call.args.to_token_stream();`
`38`	`32`	`quote! { #func (Ctx, #args) }`
	`33`	`+ } else if let Expr::MethodCall(call) = expr {`
	`34`	`+ let receiver = call.receiver.to_token_stream();`
	`35`	`+ let method = call.method.to_token_stream();`
	`36`	`+ let args = call.args.to_token_stream();`
	`37`	`+ quote! { #receiver . #method (Ctx, #args) }`
`39`	`38`	`} else {`
`40`	`39`	`stmt.to_token_stream()`
`41`	`40`	`}`

Lines changed: 10 additions & 2 deletions

Comments

(0)