rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix float formatting (#1331)

Browse Source
This commit is contained in:
Mark Thom
2022-03-07 19:44:31 -07:00
parent 7a9c3d351d
commit 664c0ee77c
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/heap_print.rs
View File

@@ -484,6 +484,24 @@ macro_rules! print_char {
};
}
pub fn fmt_float(mut fl: f64) -> String {
if OrderedFloat(fl) == -0f64 {
fl = 0f64;
}
if fl.fract() == 0f64 {
if fl.abs() >= 1.0e16 {
format!("{:.1e}", fl.trunc())
} else {
format!("{:.1}", fl.trunc())
}
} else if 0f64 < fl.fract().abs() && fl.fract().abs() <= 1.0e-16 {
format!("{0:.15e}", fl)
} else {
format!("{}", fl)
}
}
#[derive(Debug)]
pub struct HCPrinter<'a, Outputter> {
outputter: Outputter,
@@ -935,22 +953,8 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
match n {
NumberFocus::Unfocused(n) => match n {
Number::Float(OrderedFloat(mut fl)) => {
if OrderedFloat(fl) == -0f64 {
fl = 0f64;
}
let output_str = if fl.fract() == 0f64 {
if fl.abs() >= 1.0e16 {
format!("{:.1e}", fl.trunc())
} else {
format!("{:.1}", fl.trunc())
}
} else if 0f64 < fl.fract().abs() && fl.fract().abs() <= 1.0e-16 {
format!("{:>1e}", fl)
} else {
format!("{}", fl)
};
Number::Float(OrderedFloat(fl)) => {
let output_str = fmt_float(fl);
push_space_if_amb!(self, &output_str, {
append_str!(self, &output_str);

2
src/machine/system_calls.rs
View File

@@ -1818,7 +1818,7 @@ impl Machine {
let string = match Number::try_from(n) {
Ok(Number::Float(OrderedFloat(n))) => {
format!("{0:<20?}", n)
fmt_float(n)
}
Ok(Number::Fixnum(n)) => n.get_num().to_string(),
Ok(Number::Integer(n)) => n.to_string(),