Merge pull request RustPython#439 from RustPython/move_unwrap_constant

Move unwrap_constant from Frame to PyContext.

Author: windelbouwman

vm/src/frame.rs

@@ -169,7 +169,7 @@ impl Frame {
 
         match &instruction {
             bytecode::Instruction::LoadConst { ref value } => {
-                let obj = self.unwrap_constant(vm, value);
+                let obj = vm.ctx.unwrap_constant(value);
                 self.push_value(obj);
                 Ok(None)
             }
@@ -1026,25 +1026,6 @@ impl Frame {
         Ok(None)
     }
 
-    fn unwrap_constant(&self, vm: &VirtualMachine, value: &bytecode::Constant) -> PyObjectRef {
-        match *value {
-            bytecode::Constant::Integer { ref value } => vm.ctx.new_int(value.clone()),
-            bytecode::Constant::Float { ref value } => vm.ctx.new_float(*value),
-            bytecode::Constant::Complex { ref value } => vm.ctx.new_complex(*value),
-            bytecode::Constant::String { ref value } => vm.new_str(value.clone()),
-            bytecode::Constant::Bytes { ref value } => vm.ctx.new_bytes(value.clone()),
-            bytecode::Constant::Boolean { ref value } => vm.new_bool(value.clone()),
-            bytecode::Constant::Code { ref code } => vm.ctx.new_code_object(code.clone()),
-            bytecode::Constant::Tuple { ref elements } => vm.ctx.new_tuple(
-                elements
-                    .iter()
-                    .map(|value| self.unwrap_constant(vm, value))
-                    .collect(),
-            ),
-            bytecode::Constant::None => vm.ctx.none(),
-        }
-    }
-
     pub fn get_lineno(&self) -> ast::Location {
         self.code.locations[self.lasti].clone()
     }

vm/src/pyobject.rs

@@ -667,6 +667,26 @@ impl PyContext {
             ref payload => unimplemented!("set_attr unimplemented for: {:?}", payload),
         };
     }
+
+    pub fn unwrap_constant(&mut self, value: &bytecode::Constant) -> PyObjectRef {
+        match *value {
+            bytecode::Constant::Integer { ref value } => self.new_int(value.clone()),
+            bytecode::Constant::Float { ref value } => self.new_float(*value),
+            bytecode::Constant::Complex { ref value } => self.new_complex(*value),
+            bytecode::Constant::String { ref value } => self.new_str(value.clone()),
+            bytecode::Constant::Bytes { ref value } => self.new_bytes(value.clone()),
+            bytecode::Constant::Boolean { ref value } => self.new_bool(value.clone()),
+            bytecode::Constant::Code { ref code } => self.new_code_object(code.clone()),
+            bytecode::Constant::Tuple { ref elements } => {
+                let elements = elements
+                    .iter()
+                    .map(|value| self.unwrap_constant(value))
+                    .collect();
+                self.new_tuple(elements)
+            }
+            bytecode::Constant::None => self.none(),
+        }
+    }
 }
 
 /// This is an actual python object. It consists of a `typ` which is the