mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-09 22:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix format_bool

Browse source
This commit is contained in:
yt2b 2023-06-15 01:14:42 +09:00
parent 40a603208f
commit cf2f6e9f72
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
format/src/format.rs
View file

@ -1,5 +1,6 @@
use itertools::{Itertools, PeekingNext}; use itertools::{Itertools, PeekingNext};
use malachite_bigint::{BigInt, Sign}; use malachite_bigint::{BigInt, Sign};
use num_traits::FromPrimitive;
use num_traits::{cast::ToPrimitive, Signed}; use num_traits::{cast::ToPrimitive, Signed};
use rustpython_literal::float; use rustpython_literal::float;
use rustpython_literal::format::Case; use rustpython_literal::format::Case;
@ -419,15 +420,25 @@ impl FormatSpec {
pub fn format_bool(&self, input: bool) -> Result<String, FormatSpecError> { pub fn format_bool(&self, input: bool) -> Result<String, FormatSpecError> {
let x = u8::from(input); let x = u8::from(input);
let result: Result<String, FormatSpecError> = match &self.format_type { match &self.format_type {
Some(FormatType::Decimal) => Ok(x.to_string()), Some(
FormatType::Binary
| FormatType::Decimal
| FormatType::Octal
| FormatType::Number(Case::Lower)
| FormatType::Hex(_)
| FormatType::GeneralFormat(_)
| FormatType::Character,
) => self.format_int(&BigInt::from_u8(x).unwrap()),
Some(FormatType::Exponent(_) | FormatType::FixedPoint(_) | FormatType::Percentage) => {
self.format_float(x as f64)
}
None => { None => {
let first_letter = (input.to_string().as_bytes()[0] as char).to_uppercase(); let first_letter = (input.to_string().as_bytes()[0] as char).to_uppercase();
Ok(first_letter.collect::<String>() + &input.to_string()[1..]) Ok(first_letter.collect::<String>() + &input.to_string()[1..])
} }
_ => Err(FormatSpecError::InvalidFormatSpecifier), _ => Err(FormatSpecError::InvalidFormatSpecifier),
}; }
result
} }
pub fn format_float(&self, num: f64) -> Result<String, FormatSpecError> { pub fn format_float(&self, num: f64) -> Result<String, FormatSpecError> {