Add vm.to_repr and call for formatting list/tuple/dict elements.

Author: cthulahoops

tests/snippets/strings.py

@@ -15,3 +15,5 @@
 assert str(2.1) == "2.1"
 assert str() == ""
 assert str("abc") == "abc"
+
+assert str(["a", "b", "can't"]) == "['a', 'b', 'can\\'t']"

vm/src/obj/objdict.rs

@@ -50,7 +50,7 @@ fn dict_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let elements = get_elements(o);
     let mut str_parts = vec![];
     for elem in elements {
-        match vm.to_str(elem.1) {
+        match vm.to_repr(elem.1) {
             Ok(s) => {
                 let value_str = objstr::get_value(&s);
                 str_parts.push(format!("{}: {}", elem.0, value_str));

vm/src/obj/objlist.rs

@@ -74,7 +74,7 @@ fn list_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let elements = get_elements(o);
     let mut str_parts = vec![];
     for elem in elements {
-        match vm.to_str(elem) {
+        match vm.to_repr(elem) {
             Ok(s) => str_parts.push(objstr::get_value(&s)),
             Err(err) => return Err(err),
         }

vm/src/obj/objtuple.rs

@@ -36,7 +36,7 @@ fn tuple_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
     let mut str_parts = vec![];
     for elem in elements {
-        match vm.to_str(elem) {
+        match vm.to_repr(elem) {
             Ok(s) => str_parts.push(objstr::get_value(&s)),
             Err(err) => return Err(err),
         }

vm/src/vm.rs

@@ -142,6 +142,10 @@ impl VirtualMachine {
         self.call_method(obj, "__str__", vec![])
     }
 
+    pub fn to_repr(&mut self, obj: PyObjectRef) -> PyResult {
+        self.call_method(obj, "__repr__", vec![])
+    }
+
     pub fn current_frame(&self) -> &Frame {
         self.frames.last().unwrap()
     }