fixed precison printing of zero and neg zero for FStandard

haskell · Jan 15, 2024 · 072ade0 · 072ade0
1 parent 3612878
commit 072ade0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Data/ByteString/Builder/RealFloat.hs b/Data/ByteString/Builder/RealFloat.hs
@@ -7,6 +7,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE BlockArguments #-}
+{-# LANGUAGE NamedFieldPuns #-}
 -- |
 -- Module      : Data.ByteString.Builder.RealFloat
 -- Copyright   : (c) Lawrence Wu 2021
@@ -81,6 +82,7 @@ module Data.ByteString.Builder.RealFloat
 
 import Data.ByteString.Builder.Internal (Builder)
 import qualified Data.ByteString.Builder.RealFloat.Internal as R
+import Data.ByteString.Builder.RealFloat.Internal (positiveZero, negativeZero)
 import qualified Data.ByteString.Builder.RealFloat.F2S as RF
 import qualified Data.ByteString.Builder.RealFloat.D2S as RD
 import qualified Data.ByteString.Builder.Prim as BP
@@ -132,7 +134,12 @@ fGeneric eE = FGeneric (R.asciiRaw $ ord eE)
 --
 -- @since 0.11.2.0
 standard :: Int -> FloatFormat
-standard n = FStandard (Just n) standardSpecialStrings
+standard n = FStandard (Just n) standardSpecialStrings {positiveZero, negativeZero}
+  where
+  positiveZero = if n == 0
+    then "0"
+    else "0." <> replicate n '0'
+  negativeZero = "-" <> positiveZero
 
 -- | Standard notation with the \'default precision\' (decimal places matching `show`)
 --

diff --git a/tests/builder/Data/ByteString/Builder/Tests.hs b/tests/builder/Data/ByteString/Builder/Tests.hs
@@ -799,7 +799,8 @@ testsFloating = testGroup "RealFloat"
           singleMatches (formatDouble (standard 3)) (flip (showFFloat (Just 3)) []) ( 0.0096  , "0.010"    )
           singleMatches (formatDouble (standard 5)) (flip (showFFloat (Just 5)) []) ( 12.345  , "12.34500" )
           singleMatches (formatDouble (standard 3)) (flip (showFFloat (Just 3)) []) ( 0.0     , "0.000"    )
-      , testProperty "standard N" \(NonNegative p, d :: Double) -> (LC.unpack . toLazyByteString) (formatDouble (standard p) d) === showFFloat (Just p) d ""
+      , testProperty "standard N" \(NonNegative p, d :: Double) -> (LC.unpack . toLazyByteString)
+        (formatDouble (standard p) d) === showFFloat (Just p) d ""
       ]
     , testMatches "d2sLooksLikePowerOf5" doubleDec show
           [ ( (coerceWord64ToDouble 0x4830F0CF064DD592) , "5.764607523034235e39" )