Improve int type error

windelbouwman · windelbouwman · commit 947c17eb84f6 · 2018-09-02T21:49:56.000+02:00
diff --git a/vm/src/obj/objbytes.rs b/vm/src/obj/objbytes.rs
@@ -24,7 +24,7 @@ fn bytes_init(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let val = if objtype::isinstance(arg, vm.ctx.list_type()) {
         let mut data_bytes = vec![];
         for elem in objlist::get_elements(arg) {
-            let v = match objint::to_int(vm, &elem) {
+            let v = match objint::to_int(vm, &elem, 10) {
                 Ok(int_ref) => int_ref,
                 Err(err) => return Err(err),
             };
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -4,6 +4,7 @@ use super::super::pyobject::{
 };
 use super::super::vm::VirtualMachine;
 use super::objfloat;
+use super::objstr;
 use super::objtype;
 
 fn int_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
@@ -17,21 +18,40 @@ fn int_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     if !objtype::issubclass(cls, vm.ctx.int_type()) {
         return Err(vm.new_type_error(format!("{:?} is not a subtype of int", cls)));
     }
-    let val = to_int(vm, &args.args[1].clone())?;
+
+    // TODO: extract kwargs:
+    let base = 10;
+    let val = to_int(vm, &args.args[1].clone(), base)?;
     Ok(PyObject::new(
         PyObjectKind::Integer { value: val },
         cls.clone(),
     ))
 }
 
 // Casting function:
-pub fn to_int(vm: &mut VirtualMachine, obj: &PyObjectRef) -> Result<i32, PyObjectRef> {
+pub fn to_int(vm: &mut VirtualMachine, obj: &PyObjectRef, base: u32) -> Result<i32, PyObjectRef> {
     let val = if objtype::isinstance(obj, vm.ctx.int_type()) {
         get_value(obj)
     } else if objtype::isinstance(obj, vm.ctx.float_type()) {
         objfloat::get_value(obj) as i32
+    } else if objtype::isinstance(obj, vm.ctx.str_type()) {
+        let s = objstr::get_value(obj);
+        match i32::from_str_radix(&s, base) {
+            Ok(v) => v,
+            Err(err) => {
+                trace!("Error occured during int conversion {:?}", err);
+                return Err(vm.new_value_error(format!(
+                    "invalid literal for int() with base {}: '{}'",
+                    base, s
+                )));
+            }
+        }
     } else {
-        return Err(vm.new_type_error("Cannot construct int".to_string()));
+        let type_name = objtype::get_type_name(&obj.typ());
+        return Err(vm.new_type_error(format!(
+            "int() argument must be a string or a number, not '{}'",
+            type_name
+        )));
     };
     Ok(val)
 }
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -73,10 +73,15 @@ impl VirtualMachine {
     }
 
     pub fn new_type_error(&mut self, msg: String) -> PyObjectRef {
-        let type_error = self.context().exceptions.type_error.clone();
+        let type_error = self.ctx.exceptions.type_error.clone();
         self.new_exception(type_error, msg)
     }
 
+    pub fn new_value_error(&mut self, msg: String) -> PyObjectRef {
+        let value_error = self.ctx.exceptions.value_error.clone();
+        self.new_exception(value_error, msg)
+    }
+
     pub fn new_scope(&mut self) -> PyObjectRef {
         let parent_scope = self.current_frame_mut().locals.clone();
         self.ctx.new_scope(Some(parent_scope))
