frame

OddCoincidence · OddCoincidence · commit 53e459191194 · 2019-03-09T09:28:12.000-08:00
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -21,8 +21,8 @@ use crate::obj::objlist;
 use crate::obj::objstr;
 use crate::obj::objtype;
 use crate::pyobject::{
-    DictProtocol, IdProtocol, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult,
-    TryFromObject, TypeProtocol,
+    DictProtocol, IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectPayload2,
+    PyObjectRef, PyResult, TryFromObject, TypeProtocol,
 };
 use crate::vm::VirtualMachine;
 
@@ -76,6 +76,12 @@ pub struct Frame {
     pub lasti: RefCell<usize>,        // index of last instruction ran
 }
 
+impl PyObjectPayload2 for Frame {
+    fn required_type(ctx: &PyContext) -> PyObjectRef {
+        ctx.frame_type()
+    }
+}
+
 // Running a frame can result in one of the below:
 pub enum ExecutionResult {
     Return(PyObjectRef),
diff --git a/vm/src/obj/objframe.rs b/vm/src/obj/objframe.rs
@@ -3,9 +3,7 @@
 */
 
 use crate::frame::Frame;
-use crate::pyobject::{
-    PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
-};
+use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine;
 
 pub fn init(context: &PyContext) {
@@ -39,9 +37,5 @@ fn frame_fcode(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 }
 
 pub fn get_value(obj: &PyObjectRef) -> &Frame {
-    if let PyObjectPayload::Frame { frame } = &obj.payload {
-        frame
-    } else {
-        panic!("Inner error getting int {:?}", obj);
-    }
+    &obj.payload::<Frame>().unwrap()
 }
diff --git a/vm/src/obj/objgenerator.rs b/vm/src/obj/objgenerator.rs
@@ -2,7 +2,7 @@
  * The mythical generator.
  */
 
-use crate::frame::ExecutionResult;
+use crate::frame::{ExecutionResult, Frame};
 use crate::pyobject::{
     PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
 };
@@ -56,7 +56,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 PyObjectPayload::Frame { ref frame } = frame.payload {
+        if let Some(frame) = frame.payload::<Frame>() {
             frame.push_value(value.clone());
         } else {
             panic!("Generator frame isn't a frame.");
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -625,8 +625,8 @@ impl PyContext {
 
     pub fn new_frame(&self, code: PyObjectRef, scope: ScopeRef) -> PyObjectRef {
         PyObject::new(
-            PyObjectPayload::Frame {
-                frame: Frame::new(code, scope),
+            PyObjectPayload::AnyRustValue {
+                value: Box::new(Frame::new(code, scope)),
             },
             self.frame_type(),
         )
@@ -1508,9 +1508,6 @@ pub enum PyObjectPayload {
     MemoryView {
         obj: PyObjectRef,
     },
-    Frame {
-        frame: Frame,
-    },
     Generator {
         frame: PyObjectRef,
     },
@@ -1538,7 +1535,6 @@ impl fmt::Debug for PyObjectPayload {
             PyObjectPayload::Iterator { .. } => write!(f, "iterator"),
             PyObjectPayload::Slice { .. } => write!(f, "slice"),
             PyObjectPayload::Generator { .. } => write!(f, "generator"),
-            PyObjectPayload::Frame { .. } => write!(f, "frame"),
             PyObjectPayload::AnyRustValue { value } => value.fmt(f),
         }
     }
