shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

properly omit negative for values that round to zero

Browse Source
This commit is contained in:
ConnorSkees 2020-03-31 01:38:57 -04:00
parent 75b896fe3d
commit 90b940fd7d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/value/number.rs
View File

@ -165,10 +165,6 @@ from_integer!(u8);
impl Display for Number { impl Display for Number {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if self.val.is_negative() {
f.write_char('-')?;
}
let mut whole = self.val.to_integer().abs(); let mut whole = self.val.to_integer().abs();
let mut dec = String::new(); let mut dec = String::new();
@ -218,6 +214,10 @@ impl Display for Number {
} }
} }
} }
if self.val.is_negative() && (!whole.is_zero() || !dec.is_empty()) {
f.write_char('-')?;
}
write!(f, "{}", whole)?; write!(f, "{}", whole)?;
write!(f, "{}", dec)?; write!(f, "{}", dec)?;
Ok(()) Ok(())

5
tests/number.rs
View File

@ -81,3 +81,8 @@ test!(
"a {\n color: 1 + 3/4;\n}\n", "a {\n color: 1 + 3/4;\n}\n",
"a {\n color: 1.75;\n}\n" "a {\n color: 1.75;\n}\n"
); );
test!(
negative_near_zero_no_sign,
"a {\n color: -0.000000000001;\n}\n",
"a {\n color: 0;\n}\n"
);