object.__str__ delegates to __repr__.

Author: cthulahoops

vm/src/obj/objdict.rs

@@ -44,7 +44,7 @@ fn dict_len(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     Ok(vm.ctx.new_int(elements.len() as i32))
 }
 
-fn dict_str(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+fn dict_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(o, Some(vm.ctx.dict_type()))]);
 
     let elements = get_elements(o);
@@ -76,5 +76,5 @@ pub fn init(context: &PyContext) {
     let ref dict_type = context.dict_type;
     dict_type.set_attr("__len__", context.new_rustfunc(dict_len));
     dict_type.set_attr("__new__", context.new_rustfunc(dict_new));
-    dict_type.set_attr("__str__", context.new_rustfunc(dict_str));
+    dict_type.set_attr("__repr__", context.new_rustfunc(dict_repr));
 }

vm/src/obj/objfloat.rs

@@ -5,7 +5,7 @@ use super::super::vm::VirtualMachine;
 use super::objint;
 use super::objtype;
 
-fn str(vm: &mut VirtualMachine, args: PyFuncArgs) -> Result<PyObjectRef, PyObjectRef> {
+fn float_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> Result<PyObjectRef, PyObjectRef> {
     arg_check!(vm, args, required = [(float, Some(vm.ctx.float_type()))]);
     let v = get_value(float);
     Ok(vm.new_str(v.to_string()))
@@ -120,7 +120,6 @@ pub fn init(context: &PyContext) {
     float_type.set_attr("__add__", context.new_rustfunc(float_add));
     float_type.set_attr("__init__", context.new_rustfunc(float_init));
     float_type.set_attr("__pow__", context.new_rustfunc(float_pow));
-    float_type.set_attr("__str__", context.new_rustfunc(str));
     float_type.set_attr("__sub__", context.new_rustfunc(float_sub));
-    float_type.set_attr("__repr__", context.new_rustfunc(str));
+    float_type.set_attr("__repr__", context.new_rustfunc(float_repr));
 }

vm/src/obj/objint.rs

@@ -6,7 +6,7 @@ use super::super::vm::VirtualMachine;
 use super::objfloat;
 use super::objtype;
 
-fn str(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+fn int_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(int, Some(vm.ctx.int_type()))]);
     let v = get_value(int);
     Ok(vm.new_str(v.to_string()))
@@ -219,8 +219,7 @@ pub fn init(context: &PyContext) {
     int_type.set_attr("__mul__", context.new_rustfunc(int_mul));
     int_type.set_attr("__or__", context.new_rustfunc(int_or));
     int_type.set_attr("__pow__", context.new_rustfunc(int_pow));
-    int_type.set_attr("__repr__", context.new_rustfunc(str));
-    int_type.set_attr("__str__", context.new_rustfunc(str));
+    int_type.set_attr("__repr__", context.new_rustfunc(int_repr));
     int_type.set_attr("__sub__", context.new_rustfunc(int_sub));
     int_type.set_attr("__truediv__", context.new_rustfunc(int_truediv));
     int_type.set_attr("__xor__", context.new_rustfunc(int_xor));

vm/src/obj/objlist.rs

@@ -68,7 +68,7 @@ fn list_add(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     }
 }
 
-fn list_str(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+fn list_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(o, Some(vm.ctx.list_type()))]);
 
     let elements = get_elements(o);
@@ -136,7 +136,7 @@ pub fn init(context: &PyContext) {
     list_type.set_attr("__eq__", context.new_rustfunc(list_eq));
     list_type.set_attr("__add__", context.new_rustfunc(list_add));
     list_type.set_attr("__len__", context.new_rustfunc(list_len));
-    list_type.set_attr("__str__", context.new_rustfunc(list_str));
+    list_type.set_attr("__repr__", context.new_rustfunc(list_repr));
     list_type.set_attr("append", context.new_rustfunc(append));
     list_type.set_attr("clear", context.new_rustfunc(clear));
     list_type.set_attr("reverse", context.new_rustfunc(reverse));

vm/src/obj/objobject.rs

@@ -50,6 +50,11 @@ fn object_ne(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 }
 
 fn object_str(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(vm, args, required = [(zelf, Some(vm.ctx.object()))]);
+    vm.call_method(zelf.clone(), "__repr__", vec![])
+}
+
+fn object_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(obj, Some(vm.ctx.object()))]);
     let type_name = objtype::get_type_name(&obj.typ());
     let address = obj.get_id();
@@ -64,6 +69,7 @@ pub fn init(context: &PyContext) {
     object.set_attr("__ne__", context.new_rustfunc(object_ne));
     object.set_attr("__dict__", context.new_member_descriptor(object_dict));
     object.set_attr("__str__", context.new_rustfunc(object_str));
+    object.set_attr("__repr__", context.new_rustfunc(object_repr));
 }
 
 fn object_init(vm: &mut VirtualMachine, _args: PyFuncArgs) -> PyResult {

vm/src/obj/objtuple.rs

@@ -29,7 +29,7 @@ fn tuple_len(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     Ok(vm.context().new_int(elements.len() as i32))
 }
 
-fn tuple_str(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+fn tuple_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(zelf, Some(vm.ctx.tuple_type()))]);
 
     let elements = get_elements(zelf);
@@ -62,5 +62,5 @@ pub fn init(context: &PyContext) {
     let ref tuple_type = context.tuple_type;
     tuple_type.set_attr("__eq__", context.new_rustfunc(tuple_eq));
     tuple_type.set_attr("__len__", context.new_rustfunc(tuple_len));
-    tuple_type.set_attr("__str__", context.new_rustfunc(tuple_str));
+    tuple_type.set_attr("__repr__", context.new_rustfunc(tuple_repr));
 }

vm/src/obj/objtype.rs

@@ -25,7 +25,7 @@ pub fn init(context: &PyContext) {
     type_type.set_attr("__new__", context.new_rustfunc(type_new));
     type_type.set_attr("__mro__", context.new_member_descriptor(type_mro));
     type_type.set_attr("__class__", context.new_member_descriptor(type_new));
-    type_type.set_attr("__str__", context.new_rustfunc(type_str));
+    type_type.set_attr("__repr__", context.new_rustfunc(type_repr));
 }
 
 fn type_mro(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
@@ -221,7 +221,7 @@ pub fn new(typ: PyObjectRef, name: &str, bases: Vec<PyObjectRef>, dict: PyObject
     ))
 }
 
-fn type_str(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+fn type_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(obj, Some(vm.ctx.type_type()))]);
     let type_name = get_type_name(&obj);
     Ok(vm.new_str(format!("<class '{}'>", type_name)))

vm/src/objbool.rs

@@ -34,7 +34,7 @@ pub fn boolval(vm: &mut VirtualMachine, obj: PyObjectRef) -> Result<bool, PyObje
 pub fn init(context: &PyContext) {
     let ref bool_type = context.bool_type;
     bool_type.set_attr("__new__", context.new_rustfunc(bool_new));
-    bool_type.set_attr("__str__", context.new_rustfunc(bool_str));
+    bool_type.set_attr("__repr__", context.new_rustfunc(bool_repr));
     bool_type.set_attr("__eq__", context.new_rustfunc(bool_eq));
 }
 
@@ -71,7 +71,7 @@ pub fn get_value(obj: &PyObjectRef) -> bool {
     }
 }
 
-fn bool_str(vm: &mut VirtualMachine, args: PyFuncArgs) -> Result<PyObjectRef, PyObjectRef> {
+fn bool_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> Result<PyObjectRef, PyObjectRef> {
     arg_check!(vm, args, required = [(obj, Some(vm.ctx.bool_type()))]);
     let v = get_value(obj);
     let s = if v {