PyCallable skeetch

youknowone · youknowone · commit cb90e5dc233d · 2023-03-07T18:54:48.000+09:00
diff --git a/vm/src/protocol/mod.rs b/vm/src/protocol/mod.rs
@@ -10,3 +10,35 @@ pub use iter::{PyIter, PyIterIter, PyIterReturn};
 pub use mapping::{PyMapping, PyMappingMethods};
 pub use number::{PyNumber, PyNumberMethods};
 pub use sequence::{PySequence, PySequenceMethods};
+
+use crate::function::IntoFuncArgs;
+use crate::types::GenericMethod;
+use crate::{PyObject, PyResult, VirtualMachine};
+
+impl PyObject {
+    #[inline]
+    pub fn to_callable(&self) -> Option<PyCallable<'_>> {
+        PyCallable::new(self)
+    }
+
+    #[inline]
+    pub fn is_callable(&self) -> bool {
+        self.to_callable().is_some()
+    }
+}
+
+pub struct PyCallable<'a> {
+    pub obj: &'a PyObject,
+    pub call: GenericMethod,
+}
+
+impl<'a> PyCallable<'a> {
+    pub fn new(obj: &'a PyObject) -> Option<Self> {
+        let call = obj.class().mro_find_map(|cls| cls.slots.call.load())?;
+        Some(PyCallable { obj, call })
+    }
+
+    pub fn invoke(&self, args: impl IntoFuncArgs, vm: &VirtualMachine) -> PyResult {
+        (self.call)(self.obj, args.into_args(vm), vm)
+    }
+}
diff --git a/vm/src/signal.rs b/vm/src/signal.rs
@@ -37,8 +37,8 @@ fn trigger_signals(vm: &VirtualMachine) -> PyResult<()> {
         let triggered = trigger.swap(false, Ordering::Relaxed);
         if triggered {
             if let Some(handler) = &signal_handlers[signum] {
-                if vm.is_callable(handler) {
-                    vm.invoke(handler, (signum, vm.ctx.none()))?;
+                if let Some(callable) = handler.to_callable() {
+                    callable.invoke((signum, vm.ctx.none()), vm)?;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ fn trigger_signals(vm: &VirtualMachine) -> PyResult<()> {`
`37`	`37`	`let triggered = trigger.swap(false, Ordering::Relaxed);`
`38`	`38`	`if triggered {`
`39`	`39`	`if let Some(handler) = &signal_handlers[signum] {`
`40`		`- if vm.is_callable(handler) {`
`41`		`- vm.invoke(handler, (signum, vm.ctx.none()))?;`
	`40`	`+ if let Some(callable) = handler.to_callable() {`
	`41`	`+ callable.invoke((signum, vm.ctx.none()), vm)?;`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`