filter

OddCoincidence · OddCoincidence · commit 9544a47f464c · 2019-03-08T18:29:57.000-08:00
diff --git a/vm/src/obj/objfilter.rs b/vm/src/obj/objfilter.rs
@@ -1,10 +1,24 @@
-use super::objbool;
-use super::objiter;
 use crate::pyobject::{
-    IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol,
+    IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectPayload2, PyObjectRef,
+    PyResult, TypeProtocol,
 };
 use crate::vm::VirtualMachine; // Required for arg_check! to use isinstance
 
+use super::objbool;
+use super::objiter;
+
+#[derive(Debug)]
+pub struct PyFilter {
+    predicate: PyObjectRef,
+    iterator: PyObjectRef,
+}
+
+impl PyObjectPayload2 for PyFilter {
+    fn required_type(ctx: &PyContext) -> PyObjectRef {
+        ctx.filter_type()
+    }
+}
+
 fn filter_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(
         vm,
@@ -13,9 +27,11 @@ fn filter_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     );
     let iterator = objiter::get_iter(vm, iterable)?;
     Ok(PyObject::new(
-        PyObjectPayload::FilterIterator {
-            predicate: function.clone(),
-            iterator,
+        PyObjectPayload::AnyRustValue {
+            value: Box::new(PyFilter {
+                predicate: function.clone(),
+                iterator,
+            }),
         },
         cls.clone(),
     ))
@@ -24,10 +40,10 @@ fn filter_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 fn filter_next(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(filter, Some(vm.ctx.filter_type()))]);
 
-    if let PyObjectPayload::FilterIterator {
+    if let Some(PyFilter {
         ref predicate,
         ref iterator,
-    } = filter.payload
+    }) = filter.payload()
     {
         loop {
             let next_obj = objiter::call_next(vm, iterator)?;
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -1508,10 +1508,6 @@ pub enum PyObjectPayload {
         counter: RefCell<BigInt>,
         iterator: PyObjectRef,
     },
-    FilterIterator {
-        predicate: PyObjectRef,
-        iterator: PyObjectRef,
-    },
     Slice {
         start: Option<BigInt>,
         stop: Option<BigInt>,
@@ -1565,7 +1561,6 @@ impl fmt::Debug for PyObjectPayload {
             PyObjectPayload::WeakRef { .. } => write!(f, "weakref"),
             PyObjectPayload::Iterator { .. } => write!(f, "iterator"),
             PyObjectPayload::EnumerateIterator { .. } => write!(f, "enumerate"),
-            PyObjectPayload::FilterIterator { .. } => write!(f, "filter"),
             PyObjectPayload::Slice { .. } => write!(f, "slice"),
             PyObjectPayload::Function { .. } => write!(f, "function"),
             PyObjectPayload::Generator { .. } => write!(f, "generator"),
