Skip to content

Update for HsYAML using Scientific #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mightybyte wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update for HsYAML using Scientific #20

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bce576a
Use Scientific instead of Double
mightybyte Dec 12, 2021
1f2e9a8
Fix error...don't need to convert any more
mightybyte Dec 12, 2021
077110e
Merge remote-tracking branch 'origin/master' into fix-float-rounding-…
mightybyte May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/Data/YAML/Aeson.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import qualified Data.Aeson.Types as J
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as BS.L
import qualified Data.Map as Map
import Data.Scientific
import Data.Text (Text)
import qualified Data.Vector as V
import Data.YAML as Y hiding (decode1, decode1Strict, encode1, encode1Strict)
Expand Down Expand Up @@ -213,9 +212,7 @@ instance ToYAML J.Value where
toYAML J.Null = Scalar () SNull
toYAML (J.Bool b) = toYAML b
toYAML (J.String txt) = toYAML txt
toYAML (J.Number sc) = case floatingOrInteger sc :: Either Double Integer of
Right d -> toYAML d
Left int -> toYAML int
toYAML (J.Number sc) = toYAML sc
toYAML (J.Array a) = toYAML (V.toList a)
toYAML (J.Object o) = toYAML (Map.fromList (fromObject o))
where
Expand Down