Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-17 01:51:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

#1224 Error handling for not implemted features

Browse Source
This commit is contained in:
MinGyo Jung
2019-08-21 17:18:11 +09:00
parent 8e3090d7a2
commit e826894f02
3 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vm/src/obj/objstr.rs
View File

@@ -1231,18 +1231,22 @@ fn do_cformat_specifier(
Ok(format_spec.format_number(objint::get_value(&obj)))
}
CFormatType::Float(_) => {
if objtype::isinstance(&obj, &vm.ctx.float_type()) {
Ok(format_spec.format_float(objfloat::get_value(&obj)))
let result = if objtype::isinstance(&obj, &vm.ctx.float_type()) {
format_spec.format_float(objfloat::get_value(&obj))
} else if objtype::isinstance(&obj, &vm.ctx.int_type()) {
Ok(format_spec.format_float(objint::get_value(&obj).to_f64().unwrap()))
format_spec.format_float(objint::get_value(&obj).to_f64().unwrap())
} else {
let required_type_string = "an floating point or integer";
Err(vm.new_type_error(format!(
return Err(vm.new_type_error(format!(
"%{} format: {} is required, not {}",
format_spec.format_char,
required_type_string,
obj.class()
)))
)));
};
match result {
Ok(transformed) => Ok(transformed),
Err(error) => Err(vm.new_not_implemented_error(error)),
}
}
CFormatType::Character => {