-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1032 from haskell/text-iso8601
Text iso8601
- Loading branch information
Showing
16 changed files
with
1,004 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| lint: | ||
| ./run-hlint.sh --cpp-include include/ src/ attoparsec-iso8601/ benchmarks/ examples/ src-pure/ tests/ | ||
| ./run-hlint.sh --cpp-include include/ src/ attoparsec-iso8601/ benchmarks/ examples/ src-pure/ tests/ text-iso8601/src text-iso8601/tests |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ copyright: | |
| author: Bryan O'Sullivan <[email protected]> | ||
| maintainer: Adam Bergmark <[email protected]> | ||
| stability: experimental | ||
| cabal-version: >=1.10 | ||
| cabal-version: 1.12 | ||
| homepage: https://github.com/haskell/aeson | ||
| bug-reports: https://github.com/haskell/aeson/issues | ||
| build-type: Simple | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,25 @@ | ||
| module Data.Aeson.Parser.Time | ||
| ( | ||
| run | ||
| , day | ||
| , month | ||
| , quarter | ||
| , localTime | ||
| , timeOfDay | ||
| , timeZone | ||
| , utcTime | ||
| , zonedTime | ||
| ) where | ||
| module Data.Aeson.Parser.Time ( | ||
| run, | ||
| FT.parseDay, | ||
| FT.parseMonth, | ||
| FT.parseQuarter, | ||
| FT.parseQuarterOfYear, | ||
| FT.parseLocalTime, | ||
| FT.parseTimeOfDay, | ||
| FT.parseUTCTime, | ||
| FT.parseZonedTime, | ||
| ) where | ||
|
|
||
| import Data.Attoparsec.Text (Parser) | ||
| import Data.Text (Text) | ||
| import Data.Time.Calendar (Day) | ||
| import Data.Time.Calendar.Quarter.Compat (Quarter) | ||
| import Data.Time.Calendar.Month.Compat (Month) | ||
| import Data.Time.Clock (UTCTime(..)) | ||
| import qualified Data.Aeson.Types.Internal as Aeson | ||
| import qualified Data.Attoparsec.Text as A | ||
| import qualified Data.Attoparsec.Time as T | ||
| import qualified Data.Time.LocalTime as Local | ||
|
|
||
| -- | Run an attoparsec parser as an aeson parser. | ||
| run :: Parser a -> Text -> Aeson.Parser a | ||
| run p t = case A.parseOnly (p <* A.endOfInput) t of | ||
| Left err -> fail $ "could not parse date: " ++ err | ||
| Right r -> return r | ||
|
|
||
| -- | Parse a date of the form @[+,-]YYYY-MM-DD@. | ||
| day :: Parser Day | ||
| day = T.day | ||
| {-# INLINE day #-} | ||
|
|
||
| -- | Parse a date of the form @[+,-]YYYY-MM@. | ||
| month :: Parser Month | ||
| month = T.month | ||
| {-# INLINE month #-} | ||
|
|
||
| -- | Parse a date of the form @[+,-]YYYY-QN@. | ||
| quarter :: Parser Quarter | ||
| quarter = T.quarter | ||
| {-# INLINE quarter #-} | ||
|
|
||
| -- | Parse a time of the form @HH:MM[:SS[.SSS]]@. | ||
| timeOfDay :: Parser Local.TimeOfDay | ||
| timeOfDay = T.timeOfDay | ||
| {-# INLINE timeOfDay #-} | ||
|
|
||
| -- | Parse a quarter of the form @[+,-]YYYY-QN@. | ||
|
|
||
| -- | Parse a time zone, and return 'Nothing' if the offset from UTC is | ||
| -- zero. (This makes some speedups possible.) | ||
| timeZone :: Parser (Maybe Local.TimeZone) | ||
| timeZone = T.timeZone | ||
| {-# INLINE timeZone #-} | ||
|
|
||
| -- | Parse a date and time, of the form @YYYY-MM-DD HH:MM[:SS[.SSS]]@. | ||
| -- The space may be replaced with a @T@. The number of seconds is optional | ||
| -- and may be followed by a fractional component. | ||
| localTime :: Parser Local.LocalTime | ||
| localTime = T.localTime | ||
| {-# INLINE localTime #-} | ||
| import qualified Data.Aeson.Types.Internal as Aeson | ||
| import qualified Data.Time.FromText as FT | ||
|
|
||
| -- | Behaves as 'zonedTime', but converts any time zone offset into a | ||
| -- UTC time. | ||
| utcTime :: Parser UTCTime | ||
| utcTime = T.utcTime | ||
| {-# INLINE utcTime #-} | ||
| type Parser a = Text -> Either String a | ||
|
|
||
| -- | Parse a date with time zone info. Acceptable formats: | ||
| -- | ||
| -- @YYYY-MM-DD HH:MM Z@ | ||
| -- @YYYY-MM-DD HH:MM:SS Z@ | ||
| -- @YYYY-MM-DD HH:MM:SS.SSS Z@ | ||
| -- | ||
| -- The first space may instead be a @T@, and the second space is | ||
| -- optional. The @Z@ represents UTC. The @Z@ may be replaced with a | ||
| -- time zone offset of the form @+0000@ or @-08:00@, where the first | ||
| -- two digits are hours, the @:@ is optional and the second two digits | ||
| -- (also optional) are minutes. | ||
| zonedTime :: Parser Local.ZonedTime | ||
| zonedTime = T.zonedTime | ||
| {-# INLINE zonedTime #-} | ||
| -- | Run a @text-iso8601@ parser as an aeson parser. | ||
| run :: Parser a -> Text -> Aeson.Parser a | ||
| run f t = case f t of | ||
| Left err -> fail $ "could not parse date: " ++ err | ||
| Right r -> return r | ||
| {-# INLINE run #-} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| Copyright (c) 2023 Oleg Grenrus | ||
|
|
||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions | ||
| are met: | ||
|
|
||
| 1. Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
|
|
||
| 2. Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
|
|
||
| 3. Neither the name of the author nor the names of his contributors | ||
| may be used to endorse or promote products derived from this software | ||
| without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS | ||
| OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR | ||
| ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN | ||
| ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| POSSIBILITY OF SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| {-# LANGUAGE OverloadedStrings #-} | ||
| module Main (main) where | ||
|
|
||
| import Data.Text (Text) | ||
| import Test.Tasty.Bench (defaultMain, bench, nf) | ||
|
|
||
| import qualified Data.Attoparsec.Text as A | ||
| import qualified Data.Attoparsec.Time as A | ||
|
|
||
| import Data.Time.FromText (parseUTCTime) | ||
|
|
||
| main :: IO () | ||
| main = defaultMain | ||
| [ bench "text" $ nf parseUTCTime input1 | ||
| , bench "atto" $ nf (runAtto A.utcTime) input1 | ||
| ] | ||
|
|
||
| input1 :: Text | ||
| input1 = "2023-06-09T16:53:55Z" | ||
| {-# NOINLINE input1 #-} | ||
|
|
||
| runAtto :: A.Parser a -> Text -> Either String a | ||
| runAtto p t = A.parseOnly (p <* A.endOfInput) t |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # 0.1 | ||
|
|
||
| Initial release |
Oops, something went wrong.