cleanup

Author: OddCoincidence

vm/src/obj/objbool.rs

@@ -1,3 +1,4 @@
+use super::objstr::PyString;
 use super::objtype;
 use crate::pyobject::{
     IntoPyObject, PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
@@ -12,13 +13,14 @@ impl IntoPyObject for bool {
 }
 
 pub fn boolval(vm: &mut VirtualMachine, obj: PyObjectRef) -> Result<bool, PyObjectRef> {
+    if let Some(s) = obj.payload::<PyString>() {
+        return Ok(!s.value.is_empty());
+    }
     let result = match obj.payload {
         PyObjectPayload::Integer { ref value } => !value.is_zero(),
         PyObjectPayload::Float { value } => value != 0.0,
         PyObjectPayload::Sequence { ref elements } => !elements.borrow().is_empty(),
         PyObjectPayload::Dict { ref elements } => !elements.borrow().is_empty(),
-        // FIXME
-        //PyObjectPayload::String { ref value } => !value.is_empty(),
         PyObjectPayload::None { .. } => false,
         _ => {
             if let Ok(f) = vm.get_method(obj.clone(), "__bool__") {

vm/src/stdlib/json.rs

@@ -5,7 +5,11 @@ use serde::de::{DeserializeSeed, Visitor};
 use serde::ser::{SerializeMap, SerializeSeq};
 use serde_json;
 
-use crate::obj::{objbool, objdict, objfloat, objint, objsequence, objstr, objtype};
+use crate::obj::{
+    objbool, objdict, objfloat, objint, objsequence,
+    objstr::{self, PyString},
+    objtype,
+};
 use crate::pyobject::{
     create_type, DictProtocol, PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult,
     TypeProtocol,
@@ -167,9 +171,8 @@ impl<'de> Visitor<'de> for PyObjectDeserializer<'de> {
         // than wrapping the given object up and then unwrapping it to determine whether or
         // not it is a string
         while let Some((key_obj, value)) = access.next_entry_seed(self.clone(), self.clone())? {
-            let key: String = match key_obj.payload {
-                // FIXME
-                // PyObjectPayload::String { ref value } => value.clone(),
+            let key: String = match key_obj.payload::<PyString>() {
+                Some(PyString { ref value }) => value.clone(),
                 _ => unimplemented!("map keys must be strings"),
             };
             self.vm.ctx.set_item(&dict, &key, value);