generator

OddCoincidence · OddCoincidence · commit 6eea40799be8 · 2019-03-09T09:28:15.000-08:00
diff --git a/vm/src/obj/objgenerator.rs b/vm/src/obj/objgenerator.rs
@@ -4,10 +4,22 @@
 
 use crate::frame::{ExecutionResult, Frame};
 use crate::pyobject::{
-    PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
+    PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectPayload2, PyObjectRef, PyResult,
+    TypeProtocol,
 };
 use crate::vm::VirtualMachine;
 
+#[derive(Debug)]
+pub struct PyGenerator {
+    frame: PyObjectRef,
+}
+
+impl PyObjectPayload2 for PyGenerator {
+    fn required_type(ctx: &PyContext) -> PyObjectRef {
+        ctx.generator_type()
+    }
+}
+
 pub fn init(context: &PyContext) {
     let generator_type = &context.generator_type;
     context.set_attr(
@@ -29,7 +41,9 @@ pub fn init(context: &PyContext) {
 
 pub fn new_generator(vm: &mut VirtualMachine, frame: PyObjectRef) -> PyResult {
     Ok(PyObject::new(
-        PyObjectPayload::Generator { frame },
+        PyObjectPayload::AnyRustValue {
+            value: Box::new(PyGenerator { frame }),
+        },
         vm.ctx.generator_type.clone(),
     ))
 }
@@ -55,7 +69,7 @@ fn generator_send(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 }
 
 fn send(vm: &mut VirtualMachine, gen: &PyObjectRef, value: &PyObjectRef) -> PyResult {
-    if let PyObjectPayload::Generator { ref frame } = gen.payload {
+    if let Some(PyGenerator { ref frame }) = gen.payload() {
         if let Some(frame) = frame.payload::<Frame>() {
             frame.push_value(value.clone());
         } else {
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -1508,9 +1508,6 @@ pub enum PyObjectPayload {
     MemoryView {
         obj: PyObjectRef,
     },
-    Generator {
-        frame: PyObjectRef,
-    },
     WeakRef {
         referent: PyObjectWeakRef,
     },
@@ -1534,7 +1531,6 @@ impl fmt::Debug for PyObjectPayload {
             PyObjectPayload::WeakRef { .. } => write!(f, "weakref"),
             PyObjectPayload::Iterator { .. } => write!(f, "iterator"),
             PyObjectPayload::Slice { .. } => write!(f, "slice"),
-            PyObjectPayload::Generator { .. } => write!(f, "generator"),
             PyObjectPayload::AnyRustValue { value } => value.fmt(f),
         }
     }
