fuzzy-time 0.2.0.1 → 0.2.0.2

raw patch · 6 files changed

+33/−27 lines, 6 files

Files

• CHANGELOG.md +7/−1
• fuzzy-time.cabal +1/−3
• src/Data/FuzzyTime.hs +2/−0
• src/Data/FuzzyTime/Parser.hs +13/−13
• src/Data/FuzzyTime/Resolve.hs +5/−5
• src/Data/FuzzyTime/Types.hs +5/−5

@@ -1,7 +1,13 @@ # Changelog +## [0.2.0.2] - 2022-09-24++### Changed++* Compatibility with GHC 9.4+ ## [0.2.0.0] - 2021-11-21  ### Changed -- Got rid of CPP: Now requires `time >=1.9`+* Got rid of CPP: Now requires `time >=1.9`

@@ -3,11 +3,9 @@ -- This file has been generated from package.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack------ hash: be2dc14db2784ea2dd83200f9029650d8b2ed66b6bb584bef3b0e70f163c5507  name:           fuzzy-time-version:        0.2.0.1+version:        0.2.0.2 description:    Fuzzy time types, parsing and resolution category:       Time homepage:       https://github.com/NorfairKing/fuzzy-time

@@ -1,3 +1,5 @@+{-# OPTIONS_GHC -Wno-missing-import-lists #-}+ module Data.FuzzyTime   ( module Data.FuzzyTime.Types,     module Data.FuzzyTime.Parser,

@@ -19,20 +19,20 @@   ) where -import Control.Monad-import Data.Char as Char-import Data.Fixed-import Data.FuzzyTime.Types-import Data.List-import Data.Maybe+import Control.Monad (guard, msum, void)+import Data.Char as Char (toLower)+import Data.Fixed (Pico)+import Data.FuzzyTime.Types (DayOfWeek (Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday), FuzzyDay (DayInMonth, DiffDays, DiffMonths, DiffWeeks, ExactDay, NextDayOfTheWeek, Now, OnlyDay, Today, Tomorrow, Yesterday), FuzzyLocalTime (FuzzyLocalTime), FuzzyTimeOfDay (AtExact, AtHour, AtMinute, Evening, HoursDiff, Midnight, MinutesDiff, Morning, Noon, SecondsDiff), FuzzyZonedTime (ZonedNow), Some (Both, One, Other))+import Data.List (elemIndex, find)+import Data.Maybe (fromMaybe, maybeToList) import Data.Text (Text)-import Data.Time-import Data.Tree-import Data.Validity-import Data.Void-import Text.Megaparsec-import Text.Megaparsec.Char as Char-import Text.Megaparsec.Char.Lexer as Lexer+import Data.Time (TimeOfDay (TimeOfDay), defaultTimeLocale, parseTimeM)+import Data.Tree (Forest, Tree (Node), rootLabel, subForest)+import Data.Validity (isValid)+import Data.Void (Void)+import Text.Megaparsec (Parsec, empty, eof, label, oneOf, optional, some, try, (<|>))+import Text.Megaparsec.Char as Char (char, digitChar, letterChar, space1, string)+import Text.Megaparsec.Char.Lexer as Lexer (decimal)  type Parser = Parsec Void Text 

@@ -13,11 +13,11 @@   ) where -import Data.Fixed-import Data.FuzzyTime.Types-import Data.Maybe-import Data.Time-import Data.Time.Calendar.WeekDate+import Data.Fixed (Pico, mod')+import Data.FuzzyTime.Types (AmbiguousLocalTime (BothTimeAndDay, OnlyDaySpecified), FuzzyDay (DayInMonth, DiffDays, DiffMonths, DiffWeeks, ExactDay, NextDayOfTheWeek, Now, OnlyDay, Today, Tomorrow, Yesterday), FuzzyLocalTime (FuzzyLocalTime), FuzzyTimeOfDay (AtExact, AtHour, AtMinute, Evening, HoursDiff, Midnight, MinutesDiff, Morning, Noon, SameTime, SecondsDiff), FuzzyZonedTime (ZonedNow), Month, Some (Both, One, Other), dayOfTheWeekNum, daysInMonth, monthNum, numMonth)+import Data.Maybe (fromJust)+import Data.Time (Day, DayOfWeek, LocalTime (LocalTime), TimeOfDay (TimeOfDay), ZonedTime, addDays, fromGregorian, midday, midnight, toGregorian)+import Data.Time.Calendar.WeekDate (toWeekDate)  resolveZonedTime :: ZonedTime -> FuzzyZonedTime -> ZonedTime resolveZonedTime zt ZonedNow = zt

@@ -8,11 +8,11 @@   ) where -import Control.DeepSeq-import Data.Fixed-import Data.Int-import Data.Time-import Data.Validity+import Control.DeepSeq (NFData)+import Data.Fixed (Pico)+import Data.Int (Int16)+import Data.Time (Day, DayOfWeek (Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday), LocalTime, TimeOfDay, isLeapYear)+import Data.Validity (Validity (validate), declare, decorate, genericValidate, valid) import Data.Validity.Time () import GHC.Generics (Generic)