zip

OddCoincidence · OddCoincidence · commit 9d8bdd7012a0 · 2019-03-08T18:29:51.000-08:00
diff --git a/vm/src/obj/objmap.rs b/vm/src/obj/objmap.rs
@@ -48,7 +48,7 @@ fn map_next(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     if let Some(PyMap {
         ref mapper,
         ref iterators,
-    }) = map.payload::<PyMap>()
+    }) = map.payload()
     {
         let next_objs = iterators
             .iter()
diff --git a/vm/src/obj/objzip.rs b/vm/src/obj/objzip.rs
@@ -1,6 +1,21 @@
+use crate::pyobject::{
+    PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectPayload2, PyObjectRef, PyResult,
+    TypeProtocol,
+};
+use crate::vm::VirtualMachine;
+
 use super::objiter;
-use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};
-use crate::vm::VirtualMachine; // Required for arg_check! to use isinstance
+
+#[derive(Debug)]
+pub struct PyZip {
+    iterators: Vec<PyObjectRef>,
+}
+
+impl PyObjectPayload2 for PyZip {
+    fn required_type(ctx: &PyContext) -> PyObjectRef {
+        ctx.zip_type()
+    }
+}
 
 fn zip_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     no_kwargs!(vm, args);
@@ -11,15 +26,17 @@ fn zip_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
         .map(|iterable| objiter::get_iter(vm, iterable))
         .collect::<Result<Vec<_>, _>>()?;
     Ok(PyObject::new(
-        PyObjectPayload::ZipIterator { iterators },
+        PyObjectPayload::AnyRustValue {
+            value: Box::new(PyZip { iterators }),
+        },
         cls.clone(),
     ))
 }
 
 fn zip_next(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(zip, Some(vm.ctx.zip_type()))]);
 
-    if let PyObjectPayload::ZipIterator { ref iterators } = zip.payload {
+    if let Some(PyZip { ref iterators }) = zip.payload() {
         if iterators.is_empty() {
             Err(objiter::new_stop_iteration(vm))
         } else {
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -1512,9 +1512,6 @@ pub enum PyObjectPayload {
         predicate: PyObjectRef,
         iterator: PyObjectRef,
     },
-    ZipIterator {
-        iterators: Vec<PyObjectRef>,
-    },
     Slice {
         start: Option<BigInt>,
         stop: Option<BigInt>,
@@ -1569,7 +1566,6 @@ impl fmt::Debug for PyObjectPayload {
             PyObjectPayload::Iterator { .. } => write!(f, "iterator"),
             PyObjectPayload::EnumerateIterator { .. } => write!(f, "enumerate"),
             PyObjectPayload::FilterIterator { .. } => write!(f, "filter"),
-            PyObjectPayload::ZipIterator { .. } => write!(f, "zip"),
             PyObjectPayload::Slice { .. } => write!(f, "slice"),
             PyObjectPayload::Function { .. } => write!(f, "function"),
             PyObjectPayload::Generator { .. } => write!(f, "generator"),

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ fn map_next(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`48`	`48`	`if let Some(PyMap {`
`49`	`49`	`ref mapper,`
`50`	`50`	`ref iterators,`
`51`		`- }) = map.payload::<PyMap>()`
	`51`	`+ }) = map.payload()`
`52`	`52`	`{`
`53`	`53`	`let next_objs = iterators`
`54`	`54`	`.iter()`