Skip to content

Accept 24:00:00 time of day #1168

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

Accept 24:00:00 time of day #1168

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions text-iso8601/src/Data/Time/FromText.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,8 @@ makeTimeOfDay :: Int -> Int -> Pico -> (Local.TimeOfDay -> Either String r) -> E
makeTimeOfDay h m s kont =
if h < 24 && m < 60 && s < 61
then inline kont (Local.TimeOfDay h m s)
else if h == 24 && m == 0 && s == 0
then inline kont (Local.TimeOfDay 24 0 0)
else Left $ "Invalid time of day:" ++ show (h,m,s)

-- Parse seconds: @SS.SSS@.
Expand Down
8 changes: 8 additions & 0 deletions text-iso8601/tests/text-iso8601-tests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ main = defaultMain $ testGroup "text-iso8601"
-- accepts +23:59
, accepts T.parseUTCTime "1937-01-01T12:00:00+23:59"
, accepts T.parseUTCTime "1937-01-01T12:00:00-23:59"

-- accepts 24:00:00
, accepts T.parseUTCTime "1990-12-31T24:00:00Z"
]

, testGroup "rejected"
Expand All @@ -78,6 +81,11 @@ main = defaultMain $ testGroup "text-iso8601"
-- accepts +23:59, but not 24 or 60
, rejects T.parseUTCTime "1937-01-01T12:00:00+24:59"
, rejects T.parseUTCTime "1937-01-01T12:00:00-23:60"

-- rejects 24:xx:xx except 24:00:00
, rejects T.parseUTCTime "1990-12-31T24:00:01Z"
, rejects T.parseUTCTime "1990-12-31T24:00:60Z"
, rejects T.parseUTCTime "1990-12-31T24:01:00Z"
]
]

Expand Down
Loading