Skip to content

Support decimal output for rational #859

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support decimal output for rational #859

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions src/Data/Aeson/Types/ToJSON.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ import Data.List (intersperse)
import Data.List.NonEmpty (NonEmpty(..))
import Data.Proxy (Proxy(..))
import Data.Ratio (Ratio, denominator, numerator)
import Data.Scientific (Scientific)
import Data.Scientific (Scientific, fromRationalRepetendLimited)
import Data.Tagged (Tagged(..))
import Data.Text (Text, pack)
import Data.These (These (..))
Expand Down Expand Up @@ -1326,15 +1326,19 @@ instance ToJSON Float where
instance ToJSONKey Float where
toJSONKey = toJSONKeyTextEnc E.floatText


instance (ToJSON a, Integral a) => ToJSON (Ratio a) where
toJSON r = object [ "numerator" .= numerator r
, "denominator" .= denominator r
]

toEncoding r = E.pairs $
"numerator" .= numerator r <>
"denominator" .= denominator r
toJSON r = case fromRationalRepetendLimited 20 (toRational r) of
Right (s, Nothing) -> toJSON s
_ -> object
[ "numerator" .= numerator r
, "denominator" .= denominator r
]

toEncoding r = case fromRationalRepetendLimited 20 (toRational r) of
Right (s, Nothing) -> toEncoding s
_ -> E.pairs $
"numerator" .= numerator r <>
"denominator" .= denominator r


instance HasResolution a => ToJSON (Fixed a) where
Expand Down