(WIP) poc of formatting ascii hiint

youknowone · youknowone · commit 01aaa9b31c79 · 2022-12-31T11:17:49.000+09:00
diff --git a/vm/src/builtins/str.rs b/vm/src/builtins/str.rs
@@ -788,7 +788,7 @@ impl PyStr {
     #[pymethod(name = "__format__")]
     fn format_str(&self, spec: PyStrRef, vm: &VirtualMachine) -> PyResult<String> {
         match FormatSpec::parse(spec.as_str())
-            .and_then(|format_spec| format_spec.format_string(self.as_str()))
+            .and_then(|format_spec| format_spec.format_string(self.as_str(), self.is_ascii()))
         {
             Ok(string) => Ok(string),
             Err(err) => Err(vm.new_value_error(err.to_string())),
diff --git a/vm/src/format.rs b/vm/src/format.rs
@@ -438,7 +438,7 @@ impl FormatSpec {
             }
         };
 
-        self.format_sign_and_align(&magnitude_string, sign_str, FormatAlign::Right)
+        self.format_sign_and_align((&magnitude_string, true), sign_str, FormatAlign::Right)
     }
 
     #[inline]
@@ -510,13 +510,13 @@ impl FormatSpec {
             },
         };
 
-        self.format_sign_and_align(&magnitude_string, sign_str, FormatAlign::Right)
+        self.format_sign_and_align((&magnitude_string, true), sign_str, FormatAlign::Right)
     }
 
-    pub(crate) fn format_string(&self, s: &str) -> Result<String, &'static str> {
+    pub(crate) fn format_string(&self, s: &str, ascii_only: bool) -> Result<String, &'static str> {
         match self.format_type {
             Some(FormatType::String) | None => self
-                .format_sign_and_align(s, "", FormatAlign::Left)
+                .format_sign_and_align((s, ascii_only), "", FormatAlign::Left)
                 .map(|mut value| {
                     if let Some(precision) = self.precision {
                         value.truncate(precision);
@@ -529,13 +529,14 @@ impl FormatSpec {
 
     fn format_sign_and_align(
         &self,
-        magnitude_string: &str,
+        (magnitude_string, magnitude_ascii_hint): (&str, bool),
         sign_str: &str,
         default_align: FormatAlign,
     ) -> Result<String, &'static str> {
         let align = self.align.unwrap_or(default_align);
 
-        let num_chars = if magnitude_string.is_ascii() {
+        let num_chars = if magnitude_ascii_hint {
+            debug_assert!(magnitude_string.is_ascii());
             magnitude_string.len()
         } else {
             magnitude_string.chars().count()

Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,7 @@ impl PyStr {`
`788`	`788`	`#[pymethod(name = "__format__")]`
`789`	`789`	`fn format_str(&self, spec: PyStrRef, vm: &VirtualMachine) -> PyResult<String> {`
`790`	`790`	`match FormatSpec::parse(spec.as_str())`
`791`		`- .and_then(\|format_spec\| format_spec.format_string(self.as_str()))`
	`791`	`+ .and_then(\|format_spec\| format_spec.format_string(self.as_str(), self.is_ascii()))`
`792`	`792`	`{`
`793`	`793`	`Ok(string) => Ok(string),`
`794`	`794`	`Err(err) => Err(vm.new_value_error(err.to_string())),`