impl IntoPyException for FormatParseError

youknowone · youknowone · commit 9f8e2af12337 · 2020-08-05T23:15:35.000+09:00
diff --git a/vm/src/format.rs b/vm/src/format.rs
@@ -1,4 +1,4 @@
-use crate::exceptions::PyBaseExceptionRef;
+use crate::exceptions::{IntoPyException, PyBaseExceptionRef};
 use crate::function::PyFuncArgs;
 use crate::obj::{objstr, objtype};
 use crate::pyobject::{ItemProtocol, PyObjectRef, PyResult, TypeProtocol};
@@ -563,9 +563,8 @@ pub(crate) enum FormatParseError {
     InvalidCharacterAfterRightBracket,
 }
 
-impl FormatParseError {
-    // TODO: IntoPyException
-    pub fn into_pyobject(self, vm: &VirtualMachine) -> PyBaseExceptionRef {
+impl IntoPyException for FormatParseError {
+    fn into_pyexception(self, vm: &VirtualMachine) -> PyBaseExceptionRef {
         match self {
             FormatParseError::UnmatchedBracket => {
                 vm.new_value_error("expected '}' before end of string".to_owned())
@@ -812,8 +811,8 @@ impl FormatString {
                     preconversion_spec,
                     format_spec,
                 } => {
-                    let FieldName { field_type, parts } =
-                        FieldName::parse(field_name.as_str()).map_err(|e| e.into_pyobject(vm))?;
+                    let FieldName { field_type, parts } = FieldName::parse(field_name.as_str())
+                        .map_err(|e| e.into_pyexception(vm))?;
 
                     let mut argument = field_func(&field_type)?;
 
@@ -832,7 +831,7 @@ impl FormatString {
                     }
 
                     let nested_format =
-                        FormatString::from_str(&format_spec).map_err(|e| e.into_pyobject(vm))?;
+                        FormatString::from_str(&format_spec).map_err(|e| e.into_pyexception(vm))?;
                     let format_spec = nested_format.format_internal(vm, field_func)?;
 
                     let value =
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -19,6 +19,7 @@ use super::objiter;
 use super::objnone::PyNone;
 use super::objsequence::{PySliceableSequence, SequenceIndex};
 use super::objtype::{self, PyClassRef};
+use crate::exceptions::IntoPyException;
 use crate::format::{FormatSpec, FormatString, FromTemplate};
 use crate::function::{OptionalArg, OptionalOption, PyFuncArgs};
 use crate::pyobject::{
@@ -590,7 +591,7 @@ impl PyString {
     fn format(&self, args: PyFuncArgs, vm: &VirtualMachine) -> PyResult<String> {
         match FormatString::from_str(&self.value) {
             Ok(format_string) => format_string.format(&args, vm),
-            Err(err) => Err(err.into_pyobject(vm)),
+            Err(err) => Err(err.into_pyexception(vm)),
         }
     }
 
@@ -602,7 +603,7 @@ impl PyString {
     fn format_map(&self, mapping: PyObjectRef, vm: &VirtualMachine) -> PyResult<String> {
         match FormatString::from_str(&self.value) {
             Ok(format_string) => format_string.format_map(&mapping, vm),
-            Err(err) => Err(err.into_pyobject(vm)),
+            Err(err) => Err(err.into_pyexception(vm)),
         }
     }
 
diff --git a/vm/src/stdlib/string.rs b/vm/src/stdlib/string.rs
@@ -7,6 +7,7 @@ pub(crate) use _string::make_module;
 mod _string {
     use std::mem;
 
+    use crate::exceptions::IntoPyException;
     use crate::format::{
         FieldName, FieldNamePart, FieldType, FormatPart, FormatString, FromTemplate,
     };
@@ -34,7 +35,7 @@ mod _string {
     #[pyfunction]
     fn formatter_parser(text: PyStringRef, vm: &VirtualMachine) -> PyResult<PyList> {
         let format_string =
-            FormatString::from_str(text.as_str()).map_err(|e| e.into_pyobject(vm))?;
+            FormatString::from_str(text.as_str()).map_err(|e| e.into_pyexception(vm))?;
 
         let mut result = Vec::new();
         let mut literal = String::new();
@@ -73,7 +74,7 @@ mod _string {
         text: PyStringRef,
         vm: &VirtualMachine,
     ) -> PyResult<(PyObjectRef, PyList)> {
-        let field_name = FieldName::parse(text.as_str()).map_err(|e| e.into_pyobject(vm))?;
+        let field_name = FieldName::parse(text.as_str()).map_err(|e| e.into_pyexception(vm))?;
 
         let first = match field_name.field_type {
             FieldType::Auto => vm.new_str("".to_owned()),

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ use super::objiter;`
`19`	`19`	`use super::objnone::PyNone;`
`20`	`20`	`use super::objsequence::{PySliceableSequence, SequenceIndex};`
`21`	`21`	`use super::objtype::{self, PyClassRef};`
	`22`	`+use crate::exceptions::IntoPyException;`
`22`	`23`	`use crate::format::{FormatSpec, FormatString, FromTemplate};`
`23`	`24`	`use crate::function::{OptionalArg, OptionalOption, PyFuncArgs};`
`24`	`25`	`use crate::pyobject::{`
`@@ -590,7 +591,7 @@ impl PyString {`
`590`	`591`	`fn format(&self, args: PyFuncArgs, vm: &VirtualMachine) -> PyResult<String> {`
`591`	`592`	`match FormatString::from_str(&self.value) {`
`592`	`593`	`Ok(format_string) => format_string.format(&args, vm),`
`593`		`- Err(err) => Err(err.into_pyobject(vm)),`
	`594`	`+ Err(err) => Err(err.into_pyexception(vm)),`
`594`	`595`	`}`
`595`	`596`	`}`
`596`	`597`
`@@ -602,7 +603,7 @@ impl PyString {`
`602`	`603`	`fn format_map(&self, mapping: PyObjectRef, vm: &VirtualMachine) -> PyResult<String> {`
`603`	`604`	`match FormatString::from_str(&self.value) {`
`604`	`605`	`Ok(format_string) => format_string.format_map(&mapping, vm),`
`605`		`- Err(err) => Err(err.into_pyobject(vm)),`
	`606`	`+ Err(err) => Err(err.into_pyexception(vm)),`
`606`	`607`	`}`
`607`	`608`	`}`
`608`	`609`