kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Use scneitific notation when printing large or small floating-point numbers.

Browse Source
This commit is contained in:
Stephen Chung 2021-02-11 21:28:07 +08:00
parent 8ffb6c03b5
commit 6f71367c15
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ast.rs
View File

@ -1169,15 +1169,20 @@ impl crate::stdlib::ops::DerefMut for FloatWrapper {
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
impl fmt::Debug for FloatWrapper { impl fmt::Debug for FloatWrapper {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f) fmt::Display::fmt(self, f)
} }
} }
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
impl fmt::Display for FloatWrapper { impl fmt::Display for FloatWrapper {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let abs = self.0.abs();
if abs > 10000000000000.0 || abs < 0.0000000000001 {
write!(f, "{:e}", self.0)
} else {
self.0.fmt(f) self.0.fmt(f)
} }
}
} }
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]

28
src/packages/string_basic.rs
View File

@ -68,8 +68,10 @@ def_package!(crate:BasicStringPackage:"Basic string utilities, including printin
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
{ {
reg_print_functions!(lib += print_float; f32, f64); reg_print_functions!(lib += print_float_64; f64);
reg_debug_functions!(lib += debug_float; f32, f64); reg_debug_functions!(lib += print_float_64; f64);
reg_print_functions!(lib += print_float_32; f32);
reg_debug_functions!(lib += print_float_32; f32);
} }
}); });
@ -79,6 +81,24 @@ fn to_string<T: Display>(x: &mut T) -> ImmutableString {
fn to_debug<T: Debug>(x: &mut T) -> ImmutableString { fn to_debug<T: Debug>(x: &mut T) -> ImmutableString {
format!("{:?}", x).into() format!("{:?}", x).into()
} }
#[cfg(not(feature = "no_float"))]
fn print_f64(x: &mut f64) -> ImmutableString {
let abs = x.abs();
if abs > 10000000000000.0 || abs < 0.0000000000001 {
format!("{:e}", x).into()
} else {
x.to_string().into()
}
}
#[cfg(not(feature = "no_float"))]
fn print_f32(x: &mut f32) -> ImmutableString {
let abs = x.abs();
if abs > 10000000000000.0 || abs < 0.0000000000001 {
format!("{:e}", x).into()
} else {
x.to_string().into()
}
}
gen_functions!(print_basic => to_string(INT, bool, char, FnPtr)); gen_functions!(print_basic => to_string(INT, bool, char, FnPtr));
gen_functions!(debug_basic => to_debug(INT, bool, Unit, char, ImmutableString)); gen_functions!(debug_basic => to_debug(INT, bool, Unit, char, ImmutableString));
@ -102,10 +122,10 @@ gen_functions!(print_num_128 => to_string(i128, u128));
gen_functions!(debug_num_128 => to_debug(i128, u128)); gen_functions!(debug_num_128 => to_debug(i128, u128));
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
gen_functions!(print_float => to_string(f32, f64)); gen_functions!(print_float_64 => print_f64(f64));
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
gen_functions!(debug_float => to_debug(f32, f64)); gen_functions!(print_float_32 => print_f32(f32));
// Register print and debug // Register print and debug