Changed some module's name

diff --git a/Data/Time/Asctime.hs b/Data/Time/Asctime.hs
index 2eef5693f319132296d0aed02202ced63bd249ef..3ea13d824199214263e5e754ba16d1d5e18c7464 100644 (file)
--- a/Data/Time/Asctime.hs
+++ b/Data/Time/Asctime.hs
@@ -23,13 +23,10 @@ module Data.Time.Asctime
     , parse
     )
     where
-
-import qualified Text.Parsec as P
-
 import Data.Time
 import Data.Time.Calendar.WeekDate
 import Data.Time.HTTP.Common
-import Data.Time.Asctime.Parsec
+import Data.Time.Asctime.Internal
 
 -- |Format a 'LocalTime' in the ANSI C's asctime() way.
 format :: LocalTime -> String

diff --git a/Data/Time/Asctime/Parsec.hs b/Data/Time/Asctime/Internal.hs
similarity index 94%
rename from Data/Time/Asctime/Parsec.hs
rename to Data/Time/Asctime/Internal.hs
index 201f347f2b99cc9370097f5ca97c58de67d9a794..85707c653c6d3d98b0684f9886977741df7212f0 100644 (file)
--- a/Data/Time/Asctime/Parsec.hs
+++ b/Data/Time/Asctime/Internal.hs
@@ -1,15 +1,13 @@
 {-# LANGUAGE FlexibleContexts #-}
-module Data.Time.Asctime.Parsec
+module Data.Time.Asctime.Internal
     ( asctime
     )
     where
-
 import Control.Monad
 import Data.Fixed
 import Data.Time
 import Data.Time.Calendar.WeekDate
 import Data.Time.HTTP.Common
-import Text.Parsec
 
 -- |This is a parsec parser for ANSI C's asctime() format.
 asctime :: Stream s m Char => ParsecT s u m LocalTime

diff --git a/Data/Time/HTTP.hs b/Data/Time/HTTP.hs
index 9f628063938c744d232aa1751303e3e7b6b23817..4352e8b0f02b2959964c9f56622e78896cc9113f 100644 (file)
--- a/Data/Time/HTTP.hs
+++ b/Data/Time/HTTP.hs
@@ -41,12 +41,9 @@ module Data.Time.HTTP
     , parse
     )
     where
-
 import qualified Data.Time.RFC1123 as RFC1123
-import qualified Text.Parsec as P
-
 import Data.Time
-import Data.Time.HTTP.Parsec
+import Data.Time.HTTP.Internal
 
 -- |Format an 'UTCTime' in RFC 1123 date and time.
 format :: UTCTime -> String

diff --git a/Data/Time/HTTP/Common.hs b/Data/Time/HTTP/Common.hs
index a84dda7fa1434e05f75330c1435168ed97ead8f4..e0a899e6c7e801d4dc4f18d601635aaab4dfa272 100644 (file)
--- a/Data/Time/HTTP/Common.hs
+++ b/Data/Time/HTTP/Common.hs
@@ -26,12 +26,10 @@ module Data.Time.HTTP.Common
     , assertTimeOfDayIsGood
     )
     where
-
 import Control.Monad
 import Data.Fixed
 import Data.Time
 import Data.Time.Calendar.WeekDate
-import Text.Parsec
 
 shortWeekDayName :: Int -> String
 shortWeekDayName 1 = "Mon"

diff --git a/Data/Time/HTTP/Parsec.hs b/Data/Time/HTTP/Internal.hs
similarity index 76%
rename from Data/Time/HTTP/Parsec.hs
rename to Data/Time/HTTP/Internal.hs
index 6ddca7e982cbdcf8d2b6ea2f81b5737e4808e444..06a0ad2c532f6068a4dd30b1ba79d1af3dba87aa 100644 (file)
--- a/Data/Time/HTTP/Parsec.hs
+++ b/Data/Time/HTTP/Internal.hs
@@ -1,15 +1,13 @@
 {-# LANGUAGE FlexibleContexts #-}
-module Data.Time.HTTP.Parsec
+module Data.Time.HTTP.Internal
     ( rfc2616DateAndTime
     )
     where
-
 import Control.Monad
 import Data.Time
-import Data.Time.RFC1123.Parsec
-import Data.Time.RFC733.Parsec
-import Data.Time.Asctime.Parsec
-import Text.Parsec
+import Data.Time.RFC1123.Internal
+import Data.Time.RFC733.Internal
+import Data.Time.Asctime.Internal
 
 -- |This is a parsec parser for date and time formats allowed in
 -- HTTP\/1.1 (RFC 2616).

diff --git a/Data/Time/RFC1123.hs b/Data/Time/RFC1123.hs
index 43594c5d6f7b715fb383c3a1909d99c6cab89120..93aeb7e2d924d0a5ee85112c376835a6baac7b0b 100644 (file)
--- a/Data/Time/RFC1123.hs
+++ b/Data/Time/RFC1123.hs
@@ -14,14 +14,11 @@ module Data.Time.RFC1123
     , parse
     )
     where
-
-import qualified Text.Parsec as P
-
 import Data.Time
 import Data.Time.Calendar.WeekDate
 import Data.Time.HTTP.Common
 import Data.Time.RFC822 (showRFC822TimeZone)
-import Data.Time.RFC1123.Parsec
+import Data.Time.RFC1123.Internal
 
 -- |Format a 'ZonedTime' in RFC 1123.
 format :: ZonedTime -> String

diff --git a/Data/Time/RFC1123/Parsec.hs b/Data/Time/RFC1123/Internal.hs
similarity index 93%
rename from Data/Time/RFC1123/Parsec.hs
rename to Data/Time/RFC1123/Internal.hs
index 08c989c8f43dfbd1f57cc40b5c2e231f54f50108..b7bb6c9a3521056473d6da77c6b74cc3ed251690 100644 (file)
--- a/Data/Time/RFC1123/Parsec.hs
+++ b/Data/Time/RFC1123/Internal.hs
@@ -1,16 +1,14 @@
 {-# LANGUAGE FlexibleContexts #-}
-module Data.Time.RFC1123.Parsec
+module Data.Time.RFC1123.Internal
     ( rfc1123DateAndTime
     )
     where
-
 import Control.Monad
 import Data.Fixed
 import Data.Time
 import Data.Time.Calendar.WeekDate
 import Data.Time.HTTP.Common
-import Data.Time.RFC822.Parsec
-import Text.Parsec
+import Data.Time.RFC822.Internal
 
 -- |This is a parsec parser for RFC 1123 date and time strings.
 rfc1123DateAndTime :: Stream s m Char => ParsecT s u m ZonedTime

diff --git a/Data/Time/RFC733.hs b/Data/Time/RFC733.hs
index 119d01d2f0b1f013e6c81fd96e0c6984a1ee37a8..9073cd7d11848e6eab7091800320f7936b5f6bfb 100644 (file)
--- a/Data/Time/RFC733.hs
+++ b/Data/Time/RFC733.hs
@@ -42,13 +42,10 @@ module Data.Time.RFC733
     , parse
     )
     where
-
-import qualified Text.Parsec as P
-
 import Data.Time
 import Data.Time.Calendar.WeekDate
 import Data.Time.HTTP.Common
-import Data.Time.RFC733.Parsec
+import Data.Time.RFC733.Internal
 
 -- |Format a 'ZonedTime' in RFC 733.
 format :: ZonedTime -> String

diff --git a/Data/Time/RFC733/Parsec.hs b/Data/Time/RFC733/Internal.hs
similarity index 98%
rename from Data/Time/RFC733/Parsec.hs
rename to Data/Time/RFC733/Internal.hs
index f266193a66a01fe63f470c51c2311a33bc00de35..5002655afb2148499c2ff1a24310f9d55fb8c27c 100644 (file)
--- a/Data/Time/RFC733/Parsec.hs
+++ b/Data/Time/RFC733/Internal.hs
@@ -1,15 +1,13 @@
 {-# LANGUAGE FlexibleContexts #-}
-module Data.Time.RFC733.Parsec
+module Data.Time.RFC733.Internal
     ( rfc733DateAndTime
     )
     where
-
 import Control.Monad
 import Data.Fixed
 import Data.Time
 import Data.Time.Calendar.WeekDate
 import Data.Time.HTTP.Common
-import Text.Parsec
 
 -- |This is a parsec parser for RFC 733 date and time strings.
 rfc733DateAndTime :: Stream s m Char => ParsecT s u m ZonedTime

diff --git a/Data/Time/RFC822.hs b/Data/Time/RFC822.hs
index 4c8e333d6f294d2435a6a2db46338ec16e969001..5d4b862c760aadb1508e7e448a5cb85242e45a7d 100644 (file)
--- a/Data/Time/RFC822.hs
+++ b/Data/Time/RFC822.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_HADDOCK prune #-}
-
 -- |This module provides functions to parse and format RFC 822 date
 -- and time formats.
 --
@@ -37,13 +35,10 @@ module Data.Time.RFC822
     , showRFC822TimeZone
     )
     where
-
-import qualified Text.Parsec as P
-
 import Data.Time
 import Data.Time.Calendar.WeekDate
 import Data.Time.HTTP.Common
-import Data.Time.RFC822.Parsec
+import Data.Time.RFC822.Internal
 
 -- |Format a 'ZonedTime' in RFC 822.
 format :: ZonedTime -> String
@@ -71,6 +66,7 @@ format zonedTime
                , showRFC822TimeZone timeZone
                ]
 
+-- private
 showRFC822TimeZone :: TimeZone -> String
 showRFC822TimeZone tz
     | timeZoneMinutes tz == 0 = "GMT"

diff --git a/Data/Time/RFC822/Parsec.hs b/Data/Time/RFC822/Internal.hs
similarity index 97%
rename from Data/Time/RFC822/Parsec.hs
rename to Data/Time/RFC822/Internal.hs
index 0ab2985c1413057b4fb9e73382a7e28bdccbf319..ed7549a498c2d408737783951be292ef52cbd5fc 100644 (file)
--- a/Data/Time/RFC822/Parsec.hs
+++ b/Data/Time/RFC822/Internal.hs
@@ -1,20 +1,16 @@
 {-# LANGUAGE FlexibleContexts #-}
-{-# OPTIONS_HADDOCK prune     #-}
-
-module Data.Time.RFC822.Parsec
+module Data.Time.RFC822.Internal
     ( rfc822DateAndTime
 
       -- private
     , rfc822time
     )
     where
-
 import Control.Monad
 import Data.Fixed
 import Data.Time
 import Data.Time.Calendar.WeekDate
 import Data.Time.HTTP.Common
-import Text.Parsec
 
 -- |This is a parsec parser for RFC 822 date and time strings.
 rfc822DateAndTime :: Stream s m Char => ParsecT s u m ZonedTime

diff --git a/time-http.cabal b/time-http.cabal
index f057d6987a321fd44e2b4b5b3da10809690975e2..f22e117cbc2d7322482c8fbc1174fdae7b37f67e 100644 (file)
--- a/time-http.cabal
+++ b/time-http.cabal
@@ -1,5 +1,5 @@
 Name:                time-http
-Version:             0.1.0.1
+Version:             0.2
 Synopsis:            Parse and format HTTP/1.1 Date and Time strings
 Description:
         This package provides functionalities to parse and format
@@ -23,23 +23,25 @@ Source-Repository head
 Library
     Exposed-modules:
         Data.Time.RFC733
-        Data.Time.RFC733.Parsec
+        Data.Time.RFC733.Internal
         Data.Time.RFC822
-        Data.Time.RFC822.Parsec
+        Data.Time.RFC822.Internal
         Data.Time.RFC1123
-        Data.Time.RFC1123.Parsec
+        Data.Time.RFC1123.Internal
         Data.Time.Asctime
-        Data.Time.Asctime.Parsec
+        Data.Time.Asctime.Internal
         Data.Time.HTTP
-        Data.Time.HTTP.Parsec
+        Data.Time.HTTP.Internal
 
     Other-modules:
         Data.Time.HTTP.Common
 
     Build-depends:
-        base   == 4.3.*,
-        parsec == 3.1.*,
-        time   == 1.2.*
+        ascii                == 0.0.*,
+        attoparsec           == 0.9.*,
+        base                 == 4.3.*,
+        base-unicode-symbols == 0.2.*,
+        time                 == 1.2.*
 
     Extensions:
         FlexibleContexts