iso8601-duration 0.1.1.0 → 0.1.2.0
raw patch · 3 files changed
+13/−17 lines, 3 filesdep ~attoparsecdep ~basedep ~bytestringPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: attoparsec, base, bytestring, time
API changes (from Hackage documentation)
- Data.Time.ISO8601.Duration: DurDateDay :: DurDay -> (Maybe DurTime) -> DurDate
+ Data.Time.ISO8601.Duration: DurDateDay :: DurDay -> Maybe DurTime -> DurDate
- Data.Time.ISO8601.Duration: DurDateMonth :: DurMonth -> (Maybe DurTime) -> DurDate
+ Data.Time.ISO8601.Duration: DurDateMonth :: DurMonth -> Maybe DurTime -> DurDate
- Data.Time.ISO8601.Duration: DurDateYear :: DurYear -> (Maybe DurTime) -> DurDate
+ Data.Time.ISO8601.Duration: DurDateYear :: DurYear -> Maybe DurTime -> DurDate
- Data.Time.ISO8601.Duration: DurHour :: Integer -> (Maybe DurMinute) -> DurHour
+ Data.Time.ISO8601.Duration: DurHour :: Integer -> Maybe DurMinute -> DurHour
- Data.Time.ISO8601.Duration: DurMinute :: Integer -> (Maybe DurSecond) -> DurMinute
+ Data.Time.ISO8601.Duration: DurMinute :: Integer -> Maybe DurSecond -> DurMinute
- Data.Time.ISO8601.Duration: DurMonth :: Integer -> (Maybe DurDay) -> DurMonth
+ Data.Time.ISO8601.Duration: DurMonth :: Integer -> Maybe DurDay -> DurMonth
- Data.Time.ISO8601.Duration: DurYear :: Integer -> (Maybe DurMonth) -> DurYear
+ Data.Time.ISO8601.Duration: DurYear :: Integer -> Maybe DurMonth -> DurYear
- Data.Time.ISO8601.Interval: RecurringInterval :: IntervalSpec -> (Maybe Integer) -> Interval
+ Data.Time.ISO8601.Interval: RecurringInterval :: IntervalSpec -> Maybe Integer -> Interval
Files
- iso8601-duration.cabal +11/−11
- src/Data/Time/ISO8601/Duration.hs +1/−2
- src/Data/Time/ISO8601/Interval.hs +1/−4
iso8601-duration.cabal view
@@ -1,16 +1,16 @@--- Initial iso8601-duration.cabal generated by cabal init. For further +-- Initial iso8601-duration.cabal generated by cabal init. For further -- documentation, see http://haskell.org/cabal/users-guide/ name: iso8601-duration-version: 0.1.1.0+version: 0.1.2.0 synopsis: Types and parser for ISO8601 durations description: Types and parser for ISO8601 durations and intervals-homepage: https://github.com/meteogrid/iso8601-duration+homepage: https://github.com/albertov/iso8601-duration license: BSD3 license-file: LICENSE author: Alberto Valverde (original code from Niklas Hambüchen?)-maintainer: alberto@meteogrid.com-copyright: 2016-2018 Alberto Valverde+maintainer: alberto@toscat.net+copyright: 2016-2024 Alberto Valverde category: Data build-type: Simple extra-source-files: ChangeLog.md@@ -19,12 +19,12 @@ library exposed-modules: Data.Time.ISO8601.Duration , Data.Time.ISO8601.Interval- -- other-modules: + -- other-modules: other-extensions: ScopedTypeVariables, OverloadedStrings- build-depends: base >= 4.7 && < 4.12- , bytestring >= 0.10 && < 0.11- , attoparsec >= 0.13.1 && < 0.14- , time >= 1.8 && < 1.9+ build-depends: base >= 4.7 && < 5.0+ , bytestring >= 0.10 && < 0.12+ , attoparsec >= 0.13.1 && < 0.15+ , time >= 1.8 && < 1.13 , bytestring-lexing >= 0.5 && < 0.6 hs-source-dirs: src default-language: Haskell2010@@ -54,4 +54,4 @@ source-repository head type: git- location: https://github.com/meteogrid/iso8601-duration+ location: https://github.com/albertov/iso8601-duration
src/Data/Time/ISO8601/Duration.hs view
@@ -26,7 +26,6 @@ import Data.ByteString (ByteString) import Data.ByteString.Builder (Builder, toLazyByteString) import qualified Data.ByteString.Lazy as LBS-import Data.Monoid ((<>)) import Data.String (IsString, fromString) import Data.Time hiding (formatTime) @@ -167,4 +166,4 @@ durSecondToNDT (DurSecond s) = fromIntegral s addDurationWeek :: DurWeek -> UTCTime -> UTCTime-addDurationWeek (DurWeek w) = addDurDay (DurDay (w*7)) +addDurationWeek (DurWeek w) = addDurDay (DurDay (w*7))
src/Data/Time/ISO8601/Interval.hs view
@@ -12,16 +12,13 @@ import Data.Time.ISO8601.Duration import Control.Applicative-import Data.Attoparsec.ByteString (Parser) import Data.Attoparsec.ByteString.Char8 as AP import Data.ByteString.Lex.Integral (readDecimal) import Data.ByteString (ByteString) import Data.ByteString.Lazy (toStrict) import Data.ByteString.Builder-import Data.Monoid ((<>)) import Data.String (IsString(..)) import Data.Time-import Data.Time.Calendar (fromGregorian) import Data.Time.Calendar.WeekDate (fromWeekDateValid) @@ -87,7 +84,7 @@ diffTime = do h <- fromIntegral <$> intN 2 m <- fromIntegral <$> option 0 (oChar ':' *> intN 2)- s <- maybe 0 realToFrac <$> optional (oChar ':' *> scientific)+ s <- maybe 0 realToFrac <$> optional (oChar ':' *> AP.scientific) return (s + m*60 + h*3600) intN :: Int -> Parser Int