Merge pull request #81 from Tsukuba-Programming-Lab/#78_UpdateLoadMacro

#78 load マクロの仕様修正

Author: Yuta1004

crates/core_macros/src/impl/load.rs

@@ -1,23 +1,45 @@
 use proc_macro2::TokenStream;
-use quote::quote;
-use syn::ItemFn;
+use quote::{quote, ToTokens};
+use syn::{ItemFn, FnArg};
 
 pub fn proc_macro_impl_load(_args: TokenStream, ast: ItemFn) -> TokenStream {
     let fn_visibility = ast.vis;
     let fn_ident = ast.sig.ident;
-    let fn_args = ast.sig.inputs;
     let fn_ret_type = ast.sig.output;
     let fn_body = ast.block;
 
+    let fn_args = ast.sig.inputs;
+    let fn_arg_processor = &fn_args[0];
+    let fn_args_orig_def = fn_args
+        .iter()
+        .skip(1)
+        .map(|fn_arg| {
+            let fn_arg = fn_arg.to_token_stream();
+            quote! { #fn_arg , }
+        })
+        .collect::<TokenStream>();
+    let fn_args_orig_uses = fn_args
+        .iter()
+        .skip(1)
+        .map(|fn_arg| {
+            if let FnArg::Typed(pat_type) = fn_arg {
+                let pat = pat_type.pat.to_token_stream();
+                quote! { #pat , }
+            } else {
+                panic!("Unexpected argument type");
+            }
+        })
+        .collect::<TokenStream>();
+
     quote! {
-        fn #fn_ident () #fn_ret_type {
-            #fn_visibility fn __inner (#fn_args) #fn_ret_type {
+        fn #fn_ident (#fn_args_orig_def) #fn_ret_type {
+            #fn_visibility fn __inner (#fn_arg_processor, #fn_args_orig_def) #fn_ret_type {
                 #fn_body
             }
 
             let cache_body = include_str!(concat!(env!("OUT_DIR"), "/MyProcessor.cache"));
-            let deserialized = copager::prebuild::deserialize(&cache_body).unwrap();
-            __inner(deserialized)
+            let deserialized = copager::prebuild::__deserialize(&cache_body).unwrap();
+            __inner(deserialized, #fn_args_orig_uses)
         }
     }
 }

crates/core_macros/src/impl/prebuild.rs

@@ -15,7 +15,7 @@ pub fn proc_macro_impl_prebuild(_args: TokenStream, ast: ItemFn) -> TokenStream
                 #fn_body
             }
 
-            let serialized = copager::prebuild::serialize(&__inner()).unwrap();
+            let serialized = copager::prebuild::__serialize(&__inner()).unwrap();
             let out_dir = std::env::var_os("OUT_DIR").unwrap();
             let cache_path = std::path::Path::new(&out_dir).join("MyProcessor.cache");
             std::fs::write(cache_path, serialized).unwrap();

src/lib.rs

@@ -42,8 +42,8 @@ pub use copager_core_macros::*;
 
 #[cfg(feature = "prebuild")]
 pub mod prebuild {
-    pub use serde_json::to_string as serialize;
-    pub use serde_json::from_str as deserialize;
+    pub use serde_json::to_string as __serialize;
+    pub use serde_json::from_str as __deserialize;
 }
 
 #[cfg(feature = "template")]