Convert CodeObject payload to AnyRustValue

Author: coolreader18

vm/src/compile.rs

@@ -7,6 +7,7 @@
 
 use crate::bytecode::{self, CallType, CodeObject, Instruction};
 use crate::error::CompileError;
+use crate::obj::objcode;
 use crate::pyobject::{PyObject, PyObjectPayload, PyObjectRef};
 use num_complex::Complex64;
 use rustpython_parser::{ast, parser};
@@ -48,7 +49,12 @@ pub fn compile(
 
     let code = compiler.pop_code_object();
     trace!("Compilation completed: {:?}", code);
-    Ok(PyObject::new(PyObjectPayload::Code { code }, code_type))
+    Ok(PyObject::new(
+        PyObjectPayload::AnyRustValue {
+            value: Box::new(objcode::PyCode::new(code)),
+        },
+        code_type,
+    ))
 }
 
 pub enum Mode {

vm/src/obj/objcode.rs

@@ -4,9 +4,32 @@
 
 use crate::bytecode;
 use crate::pyobject::{
-    IdProtocol, PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
+    IdProtocol, PyContext, PyFuncArgs, PyObjectPayload2, PyObjectRef, PyResult, TypeProtocol,
 };
 use crate::vm::VirtualMachine;
+use std::fmt;
+
+pub struct PyCode {
+    code: bytecode::CodeObject,
+}
+
+impl PyCode {
+    pub fn new(code: bytecode::CodeObject) -> PyCode {
+        PyCode { code }
+    }
+}
+
+impl fmt::Debug for PyCode {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "code: {:?}", self.code)
+    }
+}
+
+impl PyObjectPayload2 for PyCode {
+    fn required_type(ctx: &PyContext) -> PyObjectRef {
+        ctx.code_type()
+    }
+}
 
 pub fn init(context: &PyContext) {
     let code_type = &context.code_type;
@@ -29,8 +52,8 @@ pub fn init(context: &PyContext) {
 }
 
 pub fn get_value(obj: &PyObjectRef) -> bytecode::CodeObject {
-    if let PyObjectPayload::Code { code } = &obj.payload {
-        code.clone()
+    if let Some(code) = obj.payload::<PyCode>() {
+        code.code.clone()
     } else {
         panic!("Inner error getting code {:?}", obj)
     }

vm/src/pyobject.rs

@@ -636,7 +636,12 @@ impl PyContext {
     }
 
     pub fn new_code_object(&self, code: bytecode::CodeObject) -> PyObjectRef {
-        PyObject::new(PyObjectPayload::Code { code }, self.code_type())
+        PyObject::new(
+            PyObjectPayload::AnyRustValue {
+                value: Box::new(objcode::PyCode::new(code)),
+            },
+            self.code_type(),
+        )
     }
 
     pub fn new_function(
@@ -1497,9 +1502,6 @@ pub enum PyObjectPayload {
     MemoryView {
         obj: PyObjectRef,
     },
-    Code {
-        code: bytecode::CodeObject,
-    },
     Frame {
         frame: Frame,
     },
@@ -1550,7 +1552,6 @@ impl fmt::Debug for PyObjectPayload {
             PyObjectPayload::MapIterator { .. } => write!(f, "map"),
             PyObjectPayload::ZipIterator { .. } => write!(f, "zip"),
             PyObjectPayload::Slice { .. } => write!(f, "slice"),
-            PyObjectPayload::Code { ref code } => write!(f, "code: {:?}", code),
             PyObjectPayload::Function { .. } => write!(f, "function"),
             PyObjectPayload::Generator { .. } => write!(f, "generator"),
             PyObjectPayload::BoundMethod {