Merge pull request #63 from grippy/grippy/macro-args

Add Support for CreateCommand Keys

Author: gavrie

examples/data_type.rs

@@ -83,7 +83,7 @@ redis_module! {
         MY_REDIS_TYPE,
     ],
     commands: [
-        ["alloc.set", alloc_set, "write"],
-        ["alloc.get", alloc_get, "readonly"],
+        ["alloc.set", alloc_set, "write", 1, 1, 1],
+        ["alloc.get", alloc_get, "readonly", 1, 1, 1],
     ],
 }

examples/hello.rs

@@ -29,7 +29,7 @@ redis_module! {
     version: 1,
     data_types: [],
     commands: [
-        ["hello.mul", hello_mul, ""],
+        ["hello.mul", hello_mul, "", 1, 1, 1],
     ],
 }
 

src/macros.rs

@@ -1,9 +1,14 @@
 #[macro_export]
 macro_rules! redis_command {
-    ($ctx: expr, $command_name:expr, $command_handler:expr, $command_flags:expr) => {{
+    ($ctx:expr,
+     $command_name:expr,
+     $command_handler:expr,
+     $command_flags:expr,
+     $firstkey:expr,
+     $lastkey:expr,
+     $keystep:expr) => {{
         let name = CString::new($command_name).unwrap();
         let flags = CString::new($command_flags).unwrap();
-        let (firstkey, lastkey, keystep) = (1, 1, 1);
 
         /////////////////////
         extern "C" fn do_command(
@@ -37,9 +42,9 @@ macro_rules! redis_command {
                 name.as_ptr(),
                 Some(do_command),
                 flags.as_ptr(),
-                firstkey,
-                lastkey,
-                keystep,
+                $firstkey,
+                $lastkey,
+                $keystep,
             )
         } == raw::Status::Err as c_int
         {
@@ -61,7 +66,10 @@ macro_rules! redis_module {
             $([
                 $name:expr,
                 $command:expr,
-                $flags:expr
+                $flags:expr,
+                $firstkey:expr,
+                $lastkey:expr,
+                $keystep:expr
               ]),* $(,)*
         ] $(,)*
     ) => {
@@ -112,7 +120,7 @@ macro_rules! redis_module {
             )*
 
             $(
-                redis_command!(ctx, $name, $command, $flags);
+                redis_command!(ctx, $name, $command, $flags, $firstkey, $lastkey, $keystep);
             )*
 
             raw::Status::Ok as c_int