Add check_but_allow_none macro for optional argument checking.

cthulahoops · cthulahoops · commit 4dd03047122d · 2019-03-04T14:32:52.000Z
diff --git a/vm/src/macros.rs b/vm/src/macros.rs
@@ -35,6 +35,34 @@ macro_rules! type_check {
     };
 }
 
+#[macro_export]
+macro_rules! check_but_allow_none {
+    ( $vm: ident, $arg: ident, $expected_type: expr ) => {
+        let $arg = match $arg {
+            Some(arg) => {
+                if arg.is(&$vm.get_none()) {
+                    None
+                } else {
+                    if $crate::obj::objtype::real_isinstance($vm, arg, &$expected_type)? {
+                        Some(arg)
+                    } else {
+                        let arg_typ = arg.typ();
+                        let actual_type = $vm.to_pystr(&arg_typ)?;
+                        let expected_type_name = $vm.to_pystr(&$expected_type)?;
+                        return Err($vm.new_type_error(format!(
+                            "{} must be a {}, not {}",
+                            stringify!($arg),
+                            expected_type_name,
+                            actual_type
+                        )));
+                    }
+                }
+            }
+            None => None,
+        };
+    };
+}
+
 #[macro_export]
 macro_rules! arg_check {
     ( $vm: ident, $args:ident ) => {
