move Lens' accessors next to record declarations

Author: liyang

src/Data/Thyme/Calendar.hs

@@ -18,10 +18,12 @@ module Data.Thyme.Calendar
     (
     -- * Day
       Day (..), modifiedJulianDay
+
     -- * Calendar
     , Year, Month, DayOfMonth
-    , YearMonthDay (..)
+    , YearMonthDay (..), _ymdYear, _ymdMonth, _ymdDay
     , Years, Months, Days
+
     -- * Gregorian calendar
     -- $proleptic
     , isLeapYear
@@ -263,9 +265,3 @@ addGregorianYearsClip n = gregorian %~ gregorianYearsClip n
 addGregorianYearsRollover :: Years -> Day -> Day
 addGregorianYearsRollover n = gregorian %~ gregorianYearsRollover n
 
--- * Lenses
-
-LENS(YearMonthDay,ymdYear,Year)
-LENS(YearMonthDay,ymdMonth,Month)
-LENS(YearMonthDay,ymdDay,DayOfMonth)
-

src/Data/Thyme/Calendar/Internal.hs

@@ -230,6 +230,9 @@ data OrdinalDate = OrdinalDate
     , odDay :: {-# UNPACK #-}!DayOfYear
     } deriving (INSTANCES_USUAL, Show)
 
+LENS(OrdinalDate,odYear,Year)
+LENS(OrdinalDate,odDay,DayOfYear)
+
 instance Hashable OrdinalDate
 instance NFData OrdinalDate
 
@@ -367,6 +370,9 @@ data MonthDay = MonthDay
     , mdDay :: {-# UNPACK #-}!DayOfMonth
     } deriving (INSTANCES_USUAL, Show)
 
+LENS(MonthDay,mdMonth,Month)
+LENS(MonthDay,mdDay,DayOfMonth)
+
 instance Hashable MonthDay
 instance NFData MonthDay
 
@@ -508,6 +514,10 @@ data WeekDate = WeekDate
         -- ^ /1 = Monday/ … /7 = Sunday/.
     } deriving (INSTANCES_USUAL, Show)
 
+LENS(WeekDate,wdYear,Year)
+LENS(WeekDate,wdWeek,WeekOfYear)
+LENS(WeekDate,wdDay,DayOfWeek)
+
 instance Hashable WeekDate
 instance NFData WeekDate
 
@@ -594,6 +604,10 @@ data SundayWeek = SundayWeek
         -- ^ /0 = Sunday/.
     } deriving (INSTANCES_USUAL, Show)
 
+LENS(SundayWeek,swYear,Year)
+LENS(SundayWeek,swWeek,WeekOfYear)
+LENS(SundayWeek,swDay,DayOfWeek)
+
 instance Hashable SundayWeek
 instance NFData SundayWeek
 
@@ -656,6 +670,10 @@ data MondayWeek = MondayWeek
         -- ^ /7 = Sunday/.
     } deriving (INSTANCES_USUAL, Show)
 
+LENS(MondayWeek,mwYear,Year)
+LENS(MondayWeek,mwWeek,WeekOfYear)
+LENS(MondayWeek,mwDay,DayOfWeek)
+
 instance Hashable MondayWeek
 instance NFData MondayWeek
 

src/Data/Thyme/Calendar/MonthDay.hs

@@ -6,7 +6,8 @@
 
 -- | Calendar months and day-of-months.
 module Data.Thyme.Calendar.MonthDay
-    ( Month, DayOfMonth, MonthDay (..)
+    ( Month, DayOfMonth
+    , MonthDay (..), _mdMonth, _mdDay
     , monthDay, monthDayValid, monthLength
     , module Data.Thyme.Calendar.MonthDay
     ) where
@@ -60,8 +61,3 @@ monthAndDayToDayOfYearValid
     -> Maybe DayOfYear
 monthAndDayToDayOfYearValid leap m d = monthDayValid leap (MonthDay m d)
 
--- * Lenses
-
-LENS(MonthDay,mdMonth,Month)
-LENS(MonthDay,mdDay,DayOfMonth)
-

src/Data/Thyme/Calendar/OrdinalDate.hs

@@ -11,7 +11,9 @@
 -- | ISO 8601 Ordinal Date format
 module Data.Thyme.Calendar.OrdinalDate
     ( Year, isLeapYear
-    , DayOfYear, OrdinalDate (..), ordinalDate
+    , DayOfYear
+    , OrdinalDate (..), _odYear, _odDay
+    , ordinalDate
     , module Data.Thyme.Calendar.OrdinalDate
     ) where
 
@@ -166,8 +168,3 @@ fromMondayStartWeek y w d = mondayWeek # MondayWeek y w d
 fromMondayStartWeekValid :: Year -> WeekOfYear -> DayOfWeek -> Maybe Day
 fromMondayStartWeekValid y w d = mondayWeekValid (MondayWeek y w d)
 
--- * Lenses
-
-LENS(OrdinalDate,odYear,Year)
-LENS(OrdinalDate,odDay,DayOfYear)
-

src/Data/Thyme/Calendar/WeekDate.hs

@@ -15,11 +15,17 @@
 module Data.Thyme.Calendar.WeekDate
     ( Year, WeekOfYear, DayOfWeek
     -- * ISO 8601 Week Date
-    , WeekDate (..), weekDate, weekDateValid, showWeekDate
+    , WeekDate (..), _wdYear, _wdWeek, _wdDay
+    , weekDate, weekDateValid, showWeekDate
+
     -- * Weeks starting Sunday
-    , SundayWeek (..), sundayWeek, sundayWeekValid
+    , SundayWeek (..), _swYear, _swWeek, _swDay
+    , sundayWeek, sundayWeekValid
+
     -- * Weeks starting Monday
-    , MondayWeek (..), mondayWeek, mondayWeekValid
+    , MondayWeek (..), _mwYear, _mwWeek, _mwDay
+    , mondayWeek, mondayWeekValid
+
     , module Data.Thyme.Calendar.WeekDate
     ) where
 
@@ -115,17 +121,3 @@ fromWeekDate y w d = weekDate # WeekDate y w d
 fromWeekDateValid :: Year -> WeekOfYear -> DayOfWeek -> Maybe Day
 fromWeekDateValid y w d = weekDateValid (WeekDate y w d)
 
--- * Lenses
-
-LENS(WeekDate,wdYear,Year)
-LENS(WeekDate,wdWeek,WeekOfYear)
-LENS(WeekDate,wdDay,DayOfWeek)
-
-LENS(SundayWeek,swYear,Year)
-LENS(SundayWeek,swWeek,WeekOfYear)
-LENS(SundayWeek,swDay,DayOfWeek)
-
-LENS(MondayWeek,mwYear,Year)
-LENS(MondayWeek,mwWeek,WeekOfYear)
-LENS(MondayWeek,mwDay,DayOfWeek)
-

src/Data/Thyme/Calendar/WeekdayOfMonth.hs

@@ -54,6 +54,11 @@ data WeekdayOfMonth = WeekdayOfMonth
         -- ^ Day of week. /1 = Monday, 7 = Sunday/, like ISO 8601 'WeekDate'.
     } deriving (INSTANCES_USUAL, Show)
 
+LENS(WeekdayOfMonth,womYear,Year)
+LENS(WeekdayOfMonth,womMonth,Month)
+LENS(WeekdayOfMonth,womNth,Int)
+LENS(WeekdayOfMonth,womDayOfWeek,DayOfWeek)
+
 derivingUnbox "WeekdayOfMonth"
     [t| WeekdayOfMonth -> Int |]
     [| \ WeekdayOfMonth {..} -> shiftL womYear 11 .|. shiftL womMonth 7
@@ -141,9 +146,3 @@ weekdayOfMonthValid (WeekdayOfMonth y m n wd) = (refDay .+^ s * offset)
     wo = s * (wd - wd1)
     offset = (abs n - 1) * 7 + if wo < 0 then wo + 7 else wo
 
--- * Lenses
-LENS(WeekdayOfMonth,womYear,Year)
-LENS(WeekdayOfMonth,womMonth,Month)
-LENS(WeekdayOfMonth,womNth,Int)
-LENS(WeekdayOfMonth,womDayOfWeek,DayOfWeek)
-

src/Data/Thyme/Clock.hs

@@ -23,14 +23,17 @@ literals to avoid type defaulting warnings.
 module Data.Thyme.Clock (
     -- * UTC
       UTCTime
+    , utctDay, utctDayTime
+    , _utctDay, _utctDayTime
 #if __GLASGOW_HASKELL__ >= 708
     , pattern UTCTime
 #endif
     , mkUTCTime
-    , utctDay, utctDayTime
-    , UTCView (..)
     , utcTime
+
+    , UTCView (..), _utcvDay, _utcvDayTime
     , NominalDiffTime
+
     , getCurrentTime
 
     -- * Absolute intervals
@@ -59,10 +62,6 @@ module Data.Thyme.Clock (
     , diffUTCTime
     , toMicroseconds
     , fromMicroseconds
-
-    -- * Lenses
-    , _utcvDay, _utcvDayTime
-    , _utctDay, _utctDayTime
     ) where
 
 import Prelude

src/Data/Thyme/LocalTime.hs

@@ -73,6 +73,10 @@ data TimeZone = TimeZone
     -- ^ The name of the zone, typically a three- or four-letter acronym.
     } deriving (INSTANCES_USUAL)
 
+LENS(TimeZone,timeZoneMinutes,Minutes)
+LENS(TimeZone,timeZoneSummerOnly,Bool)
+LENS(TimeZone,timeZoneName,String)
+
 instance Hashable TimeZone
 instance NFData TimeZone
 
@@ -182,6 +186,10 @@ data TimeOfDay = TimeOfDay
     , todSec :: {-# UNPACK #-}!DiffTime -- ^ Second.
     } deriving (INSTANCES_USUAL)
 
+LENS(TimeOfDay,todHour,Hour)
+LENS(TimeOfDay,todMin,Minute)
+LENS(TimeOfDay,todSec,DiffTime)
+
 derivingUnbox "TimeOfDay" [t| TimeOfDay -> Int64 |]
     [| \ TimeOfDay {..} -> fromIntegral (todHour .|. shiftL todMin 8)
         .|. shiftL (todSec ^. microseconds) 16 |]
@@ -347,6 +355,9 @@ data LocalTime = LocalTime
     -- ^ Local time-of-day.
     } deriving (INSTANCES_USUAL)
 
+LENS(LocalTime,localDay,Day)
+LENS(LocalTime,localTimeOfDay,TimeOfDay)
+
 derivingUnbox "LocalTime" [t| LocalTime -> (Day, TimeOfDay) |]
     [| \ LocalTime {..} -> (localDay, localTimeOfDay) |]
     [| \ (localDay, localTimeOfDay) -> LocalTime {..} |]
@@ -452,6 +463,9 @@ data ZonedTime = ZonedTime
     , zonedTimeZone :: !TimeZone
     } deriving (INSTANCES_USUAL)
 
+LENS(ZonedTime,zonedTimeToLocalTime,LocalTime)
+LENS(ZonedTime,zonedTimeZone,TimeZone)
+
 instance Hashable ZonedTime
 instance NFData ZonedTime where
     rnf ZonedTime {..} = rnf zonedTimeZone
@@ -655,19 +669,3 @@ utcToZonedTime z t = view zonedTime (z, t)
 zonedTimeToUTC :: ZonedTime -> UTCTime
 zonedTimeToUTC = snd . review zonedTime
 
--- * Lenses
-
-LENS(TimeZone,timeZoneMinutes,Minutes)
-LENS(TimeZone,timeZoneSummerOnly,Bool)
-LENS(TimeZone,timeZoneName,String)
-
-LENS(TimeOfDay,todHour,Hour)
-LENS(TimeOfDay,todMin,Minute)
-LENS(TimeOfDay,todSec,DiffTime)
-
-LENS(LocalTime,localDay,Day)
-LENS(LocalTime,localTimeOfDay,TimeOfDay)
-
-LENS(ZonedTime,zonedTimeToLocalTime,LocalTime)
-LENS(ZonedTime,zonedTimeZone,TimeZone)
-