delete useless old code.

example/rust/zrfu-test/src/lib.rs

@@ -81,52 +81,4 @@ zrfu_proc_def!{
     proc fn TestProcN () -> () {
         println!("hello, this function '{}' has neither args nor return.", self.proc_name.as_str());
     }
-}
-
-/*
-proc_def_ar!(
-    TestProcAR (TestProcCborIn as argsdata ; TestProcCborOut as retdata) {
-        println!("hello, this function '{}' has args and return.", self.proc_name);
-        println!("args data: {:?}", argsdata);
-        let retdata = TestProcCborOut{
-            a: argsdata.a.clone(),
-            b: argsdata.b,
-            c: argsdata.c.clone(),
-            d: argsdata.d.clone(),
-        };
-    }
-);
-
-proc_def_a!(
-    TestProcA (TestProcCborIn as argsdata) {
-        println!("hello, this function '{}' has args but has no return.", self.proc_name);
-        println!("args data: {:?}", argsdata);
-    }
-);
-
-proc_def_r!(
-    TestProcR (TestProcCborOut as retdata) {
-        println!("hello, this function '{}' has no args but has return.", self.proc_name);
-        let retdata = TestProcCborOut{
-            a: String::from("hello, gensokyo"),
-            b: 123456,
-            c: cbor!({
-                "reimu" => "hakurei",
-                "satori" =>  "komeiji",
-                "koishi" =>  "komeiji",
-            }),
-            d: cbor!({
-                "cirno" => 9,
-                "satori" => 5,
-                "remilia" => "scarlet",
-            }),
-        };
-    }
-);
-
-proc_def_n!(
-    TestProcN () {
-        println!("hello, this function '{}' has neither args nor return.", self.proc_name);
-    }
-);
-*/
+}

zry-rust-ffi-utils/src/macros/mod.rs

@@ -24,149 +24,3 @@ macro_rules! define_err_enum {
 
     }
 }
-
-#[macro_export]
-macro_rules! proc_def_ar {
-    ( $proc_name:ident ($args_type:ty as $argname:ident ; $ret_type:ty as $retname:ident)  $code:block  ) => {
-        pub struct $proc_name {
-            proc_name: String,
-            args: ZRFUProcArgs<$args_type>,
-            ret: ZRFUProcReturn<$ret_type>,
-        }
-
-        impl ZRFUProcInstanceTrait for $proc_name {
-            fn decode_input(&mut self, bv: &mut ZRFUBytesVec) -> ZRFUProcResultCode {
-                self.args.cbor_deserialize(bv)
-            }
-
-            fn call(&mut self) -> ZRFUProcResultCode {
-                let $argname = match self.args.get_data() {
-                    None => { return ZRFUProcResultCode::CanNotGetArgs; },
-                    Some(t) => t,
-                };
-                $code;
-                self.ret.set_data($retname);
-                return ZRFUProcResultCode::Ok;
-            }
-
-            fn encode_return(&mut self, bv: &mut ZRFUBytesVec) -> ZRFUProcResultCode {
-                self.ret.cbor_serialize(bv)
-            }
-        }
-
-        impl $proc_name {
-            fn factory(name: String) -> Box<dyn ZRFUProcInstanceTrait> {
-                Box::new($proc_name{
-                    proc_name: name,
-                    args: ZRFUProcArgs::new(),
-                    ret: ZRFUProcReturn::new(),
-                })
-            }
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! proc_def_a {
-    ( $proc_name:ident ($args_type:ty as $argname:ident)  $code:block  ) => {
-        pub struct $proc_name {
-            proc_name: String,
-            args: ZRFUProcArgs<$args_type>,
-        }
-
-        impl ZRFUProcInstanceTrait for $proc_name {
-            fn decode_input(&mut self, bv: &mut ZRFUBytesVec) -> ZRFUProcResultCode {
-                self.args.cbor_deserialize(bv)
-            }
-
-            fn call(&mut self) -> ZRFUProcResultCode {
-                let $argname = match self.args.get_data() {
-                    None => { return ZRFUProcResultCode::CanNotGetArgs; },
-                    Some(t) => t,
-                };
-                $code;
-                return ZRFUProcResultCode::Ok;
-            }
-
-            fn encode_return(&mut self, bv: &mut ZRFUBytesVec) -> ZRFUProcResultCode {
-                ZRFUProcResultCode::NoReturnProvided
-            }
-        }
-
-        impl $proc_name {
-            fn factory(name: String) -> Box<dyn ZRFUProcInstanceTrait> {
-                Box::new($proc_name{
-                    proc_name: name,
-                    args: ZRFUProcArgs::new(),
-                })
-            }
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! proc_def_r {
-    ( $proc_name:ident ($ret_type:ty as $retname:ident)  $code:block  ) => {
-        pub struct $proc_name {
-            proc_name: String,
-            ret: ZRFUProcReturn<$ret_type>,
-        }
-
-        impl ZRFUProcInstanceTrait for $proc_name {
-            fn decode_input(&mut self, bv: &mut ZRFUBytesVec) -> ZRFUProcResultCode {
-                ZRFUProcResultCode::NoArgsNeed
-            }
-
-            fn call(&mut self) -> ZRFUProcResultCode {
-                $code;
-                self.ret.set_data($retname);
-                return ZRFUProcResultCode::Ok;
-            }
-
-            fn encode_return(&mut self, bv: &mut ZRFUBytesVec) -> ZRFUProcResultCode {
-                self.ret.cbor_serialize(bv)
-            }
-        }
-
-        impl $proc_name {
-            fn factory(name: String) -> Box<dyn ZRFUProcInstanceTrait> {
-                Box::new($proc_name{
-                    proc_name: name,
-                    ret: ZRFUProcReturn::new(),
-                })
-            }
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! proc_def_n {
-    ( $proc_name:ident ()  $code:block  ) => {
-        pub struct $proc_name {
-            proc_name: String,
-        }
-
-        impl ZRFUProcInstanceTrait for $proc_name {
-            fn decode_input(&mut self, bv: &mut ZRFUBytesVec) -> ZRFUProcResultCode {
-                ZRFUProcResultCode::NoArgsNeed
-            }
-
-            fn call(&mut self) -> ZRFUProcResultCode {
-                $code;
-                return ZRFUProcResultCode::Ok;
-            }
-
-            fn encode_return(&mut self, bv: &mut ZRFUBytesVec) -> ZRFUProcResultCode {
-                ZRFUProcResultCode::NoReturnProvided
-            }
-        }
-
-        impl $proc_name {
-            fn factory(name: String) -> Box<dyn ZRFUProcInstanceTrait> {
-                Box::new($proc_name{
-                    proc_name: name,
-                })
-            }
-        }
-    };
-}