dispatch

Author: normanrz

zarr-matlab/rust/zarr_mex/src/lib.rs

@@ -11,28 +11,42 @@ use util::*;
 
 use std::slice;
 
-unsafe fn read(
+unsafe fn dispatch(
     nlhs: c_int,
     plhs: *mut MxArrayMut,
     nrhs: c_int,
     prhs: *const MxArray,
 ) -> Result<()> {
-    let rhs = match nrhs == 2 {
-        true => slice::from_raw_parts(prhs, nrhs as usize),
-        false => return Err("Invalid number of input arguments".to_string()),
+    let rhs = if nrhs > 0 {
+        slice::from_raw_parts(prhs, nrhs as usize)
+    } else {
+        return Err("Invalid number of input arguments".to_string());
     };
 
-    let lhs = match nlhs == 1 {
-        true => slice::from_raw_parts_mut(plhs, nlhs as usize),
-        false => return Err("Invalid number of output arguments".to_string()),
+    let lhs = if nlhs >= 0 {
+        slice::from_raw_parts_mut(plhs, nlhs as usize)
+    } else {
+        return Err("Invalid number of output arguments".to_string());
     };
 
-    let mat_arr = crate::read::read(rhs)?;
-
-    // set output
-    lhs[0] = mat_arr;
+    let command = mx_array_to_str(rhs[0])?;
+    let rhs = &rhs[1..];
+
+    match command {
+        "read" => {
+            if lhs.len() != 1 {
+                return Err(format!(
+                    "Invalid number of output arguments. Expected 1, got {}.",
+                    lhs.len()
+                ));
+            }
+            let mat_arr = crate::read::read(rhs)?;
+            lhs[0] = mat_arr;
+        }
+        _ => return Err(format!("Unknown command {:?}", command)),
+    }
 
     Ok(())
 }
 
-mex_function!(nlhs, lhs, nrhs, rhs, { read(nlhs, lhs, nrhs, rhs) });
+mex_function!(nlhs, lhs, nrhs, rhs, { dispatch(nlhs, lhs, nrhs, rhs) });

zarr-matlab/rust/zarr_mex/src/read.rs

@@ -8,6 +8,16 @@ use crate::ffi::*;
 use crate::util::*;
 
 pub(crate) fn read(rhs: &[MxArray]) -> Result<MxArrayMut> {
+    let (store_str, bbox_arr) = match rhs {
+        [store_str, bbox_arr] => (store_str, bbox_arr),
+        _ => {
+            return Err(format!(
+                "Invalid number of input arguments. Expected 2, got {}",
+                rhs.len()
+            ))
+        }
+    };
+
     let store_path: PathBuf = mx_array_to_str(rhs[0])?.into();
 
     let store: zarrs::storage::ReadableWritableListableStorage = Arc::new(