ascii 0.0.2.2 → 0.0.3

raw patch · 4 files changed

+331/−159 lines, 4 filessetup-changedPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Data/Ascii.hs +278/−106
• LICENSE +30/−30
• Setup.hs +3/−3
• ascii.cabal +20/−20

@@ -1,106 +1,278 @@-{-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving #-}-module Data.Ascii-    ( -- * Datatypes-      Ascii-    , CIAscii-    , AsciiBuilder-      -- * Construction-      -- ** Safe-    , fromByteString-    , fromChars-    , fromText-      -- ** Unsafe-    , unsafeFromByteString-    , unsafeFromString-    , unsafeFromText-      -- * Extraction-    , toByteString-    , toString-    , toText-      -- * Case insensitive-    , toCIAscii-    , fromCIAscii-    , ciToByteString-      -- * Builder-    , toAsciiBuilder-    , fromAsciiBuilder-    , unsafeFromBuilder-    , toBuilder-    ) where--import Data.ByteString (ByteString)-import qualified Data.ByteString as S-import qualified Data.ByteString.Char8 as S8-import Data.Char (isAscii)-import Data.String (IsString (..))-import Data.Data (Data)-import Data.Typeable (Typeable)-import Data.Text (Text)-import qualified Data.Text as T-import qualified Data.Text.Encoding as TE-import qualified Blaze.ByteString.Builder as Blaze-import Data.Monoid (Monoid)-import Data.CaseInsensitive (FoldCase, CI, mk, original)--newtype Ascii = Ascii ByteString-    deriving (Show, Eq, Read, Ord, Data, Typeable, IsString, FoldCase, Monoid)--type CIAscii = CI Ascii--fromByteString :: ByteString -> Maybe Ascii-fromByteString bs-    | S.all (< 128) bs = Just $ Ascii bs-    | otherwise = Nothing---- | Renamed to avoid clash with 'fromString'-fromChars :: String -> Maybe Ascii-fromChars s-    | all isAscii s = Just $ Ascii $ S8.pack s-    | otherwise = Nothing--fromText :: Text -> Maybe Ascii-fromText t-    | T.all isAscii t = Just $ Ascii $ TE.encodeUtf8 t-    | otherwise = Nothing--unsafeFromByteString :: ByteString -> Ascii-unsafeFromByteString = Ascii--unsafeFromString :: String -> Ascii-unsafeFromString = Ascii . S8.pack--unsafeFromText :: Text -> Ascii-unsafeFromText = Ascii . TE.encodeUtf8--toCIAscii :: Ascii -> CIAscii-toCIAscii = mk--fromCIAscii :: CIAscii -> Ascii-fromCIAscii = original--toByteString :: Ascii -> ByteString-toByteString (Ascii bs) = bs--toString :: Ascii -> String-toString (Ascii bs) = S8.unpack bs--toText :: Ascii -> Text-toText (Ascii bs) = TE.decodeASCII bs--ciToByteString :: CIAscii -> ByteString-ciToByteString = toByteString . original--toAsciiBuilder :: Ascii -> AsciiBuilder-toAsciiBuilder (Ascii bs) = AsciiBuilder $ Blaze.fromByteString bs--fromAsciiBuilder :: AsciiBuilder -> Ascii-fromAsciiBuilder (AsciiBuilder b) = Ascii $ Blaze.toByteString b--newtype AsciiBuilder = AsciiBuilder (Blaze.Builder)-    deriving Monoid--unsafeFromBuilder :: Blaze.Builder -> AsciiBuilder-unsafeFromBuilder = AsciiBuilder--toBuilder :: AsciiBuilder -> Blaze.Builder-toBuilder (AsciiBuilder b) = b+{-# LANGUAGE CPP, DeriveDataTypeable, GeneralizedNewtypeDeriving #-}
+module Data.Ascii
+    ( -- * Datatypes
+      Ascii
+    , CIAscii
+    , AsciiBuilder
+      -- * Construction
+      -- ** Safe
+    , fromByteString
+    , fromChars
+    , fromText
+      -- ** Unsafe
+    , unsafeFromByteString
+    , unsafeFromString
+    , unsafeFromText
+      -- * Extraction
+    , toByteString
+    , toString
+    , toText
+      -- * Case insensitive
+    , toCIAscii
+    , fromCIAscii
+    , ciToByteString
+      -- * Builder
+    , toAsciiBuilder
+    , fromAsciiBuilder
+    , unsafeFromBuilder
+    , toBuilder
+      -- * Character-level functions and predicates
+    , fromChar
+    , toChar
+    , ascii
+    , isAscii
+    , isControl
+    , isPrintable
+    , isWhiteSpace
+    , isSpaceOrTab
+    , isLower
+    , isUpper
+    , toLower
+    , toUpper
+    , isAlpha
+    , isDigit
+    , isAlphaNum
+    , fromDigit
+    , unsafeFromDigit
+    , fromOctDigit
+    , unsafeFromOctDigit
+    , isUpHexDigit
+    , fromUpHexDigit
+    , unsafeFromUpHexDigit
+    , isLowHexDigit
+    , fromLowHexDigit
+    , unsafeFromLowHexDigit
+    , isHexDigit
+    , fromHexDigit
+    , unsafeFromHexDigit
+    ) where
+
+import Data.Word (Word8)
+import Data.ByteString (ByteString)
+import qualified Data.ByteString as S
+import qualified Data.ByteString.Char8 as S8
+import qualified Data.Char as C
+import Data.String (IsString (..))
+import Data.Data (Data)
+import Data.Typeable (Typeable)
+import Data.Text (Text)
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as TE
+import qualified Blaze.ByteString.Builder as Blaze
+import Data.Monoid (Monoid)
+import Data.CaseInsensitive (FoldCase, CI, mk, original)
+
+newtype Ascii = Ascii ByteString
+    deriving (Show, Eq, Read, Ord, Data, Typeable, IsString, FoldCase, Monoid)
+
+type CIAscii = CI Ascii
+
+fromByteString :: ByteString -> Maybe Ascii
+fromByteString bs
+    | S.all (< 128) bs = Just $ Ascii bs
+    | otherwise = Nothing
+
+-- | Renamed to avoid clash with 'fromString'
+fromChars :: String -> Maybe Ascii
+fromChars s
+    | all C.isAscii s = Just $ Ascii $ S8.pack s
+    | otherwise = Nothing
+
+fromText :: Text -> Maybe Ascii
+fromText t
+    | T.all C.isAscii t = Just $ Ascii $ TE.encodeUtf8 t
+    | otherwise = Nothing
+
+unsafeFromByteString :: ByteString -> Ascii
+unsafeFromByteString = Ascii
+
+unsafeFromString :: String -> Ascii
+unsafeFromString = Ascii . S8.pack
+
+unsafeFromText :: Text -> Ascii
+unsafeFromText = Ascii . TE.encodeUtf8
+
+toCIAscii :: Ascii -> CIAscii
+toCIAscii = mk
+
+fromCIAscii :: CIAscii -> Ascii
+fromCIAscii = original
+
+toByteString :: Ascii -> ByteString
+toByteString (Ascii bs) = bs
+
+toString :: Ascii -> String
+toString (Ascii bs) = S8.unpack bs
+
+toText :: Ascii -> Text
+toText (Ascii bs) = TE.decodeASCII bs
+
+ciToByteString :: CIAscii -> ByteString
+ciToByteString = toByteString . original
+
+toAsciiBuilder :: Ascii -> AsciiBuilder
+toAsciiBuilder (Ascii bs) = AsciiBuilder $ Blaze.fromByteString bs
+
+fromAsciiBuilder :: AsciiBuilder -> Ascii
+fromAsciiBuilder (AsciiBuilder b) = Ascii $ Blaze.toByteString b
+
+newtype AsciiBuilder = AsciiBuilder (Blaze.Builder)
+    deriving Monoid
+
+unsafeFromBuilder :: Blaze.Builder -> AsciiBuilder
+unsafeFromBuilder = AsciiBuilder
+
+toBuilder :: AsciiBuilder -> Blaze.Builder
+toBuilder (AsciiBuilder b) = b
+
+fromChar :: Char -> Maybe Word8
+fromChar c = if i < 128 then Just (fromIntegral i) else Nothing
+  where i = C.ord c
+
+toChar :: Word8 -> Char
+toChar = C.chr . fromIntegral
+
+-- | Unsafe version of 'fromChar'
+ascii :: Char -> Word8
+ascii = fromIntegral . C.ord
+{-# INLINE ascii #-}
+
+isAscii :: Word8 -> Bool
+isAscii = (< 128)
+
+isControl :: Word8 -> Bool
+isControl w = w < 32 || w == 127
+
+isPrintable :: Word8 -> Bool
+isPrintable w = w >= 32 && w < 127
+
+isWhiteSpace :: Word8 -> Bool
+isWhiteSpace w = w == ascii ' ' || w >= 9 && w <= 13
+
+isSpaceOrTab :: Word8 -> Bool
+isSpaceOrTab w = w == ascii ' ' || w == ascii '\t'
+
+isLower :: Word8 -> Bool
+isLower w = w >= ascii 'a' && w <= ascii 'z'
+
+isUpper :: Word8 -> Bool
+isUpper w = w >= ascii 'A' && w <= ascii 'Z'
+
+toLower :: Word8 -> Word8
+toLower w | isUpper w = w + 32
+          | otherwise = w
+
+toUpper :: Word8 -> Word8
+toUpper w | isLower w = w - 32
+          | otherwise = w
+
+isAlpha :: Word8 -> Bool
+isAlpha w = isUpper w || isLower w
+
+isDigit :: Word8 -> Bool
+isDigit w = w >= ascii '0' && w <= ascii '9'
+
+isAlphaNum :: Word8 -> Bool
+isAlphaNum w = isDigit w || isAlpha w
+
+fromDigit :: Num a => Word8 -> Maybe a
+fromDigit w | isDigit w = Just $ unsafeFromDigit w
+            | otherwise = Nothing
+#if __GLASGOW_HASKELL__ >= 700
+{-# INLINABLE fromDigit #-}
+#endif
+
+unsafeFromDigit :: Num a => Word8 -> a
+unsafeFromDigit w = fromIntegral (w - ascii '0')
+{-# INLINE unsafeFromDigit #-}
+
+isOctDigit :: Word8 -> Bool
+isOctDigit w = w >= ascii '0' && w <= ascii '7'
+
+fromOctDigit :: Num a => Word8 -> Maybe a
+fromOctDigit w | isOctDigit w = Just $ unsafeFromOctDigit w
+               | otherwise    = Nothing
+#if __GLASGOW_HASKELL__ >= 700
+{-# INLINABLE fromOctDigit #-}
+#endif
+
+unsafeFromOctDigit :: Num a => Word8 -> a
+unsafeFromOctDigit = unsafeFromDigit
+{-# INLINE unsafeFromOctDigit #-}
+
+isLowAF :: Word8 -> Bool
+isLowAF w = w >= ascii 'a' && w <= ascii 'f'
+{-# INLINE isLowAF #-}
+
+fromLowAF :: Num a => Word8 -> a
+fromLowAF w = fromIntegral (w - ascii 'a' + 10)
+{-# INLINE fromLowAF #-}
+
+isLowHexDigit :: Word8 -> Bool
+isLowHexDigit w = isDigit w || isLowAF w
+
+fromLowHexDigit :: Num a => Word8 -> Maybe a
+fromLowHexDigit w | isDigit w = Just $ unsafeFromDigit w
+                  | isLowAF w = Just $ fromLowAF w
+                  | otherwise = Nothing
+#if __GLASGOW_HASKELL__ >= 700
+{-# INLINABLE fromLowHexDigit #-}
+#endif
+
+unsafeFromLowHexDigit :: Num a => Word8 -> a
+unsafeFromLowHexDigit w | w < ascii 'a' = unsafeFromDigit w
+                        | otherwise     = fromLowAF w
+{-# INLINE unsafeFromLowHexDigit #-}
+
+isUpAF :: Word8 -> Bool
+isUpAF w = w >= ascii 'A' && w <= ascii 'F'
+{-# INLINE isUpAF #-}
+
+fromUpAF :: Num a => Word8 -> a
+fromUpAF w = fromIntegral (w - ascii 'A' + 10)
+{-# INLINE fromUpAF #-}
+
+isUpHexDigit :: Word8 -> Bool
+isUpHexDigit w = isDigit w || isUpAF w
+
+fromUpHexDigit :: Num a => Word8 -> Maybe a
+fromUpHexDigit w | isDigit w = Just $ unsafeFromDigit w
+                 | isUpAF w  = Just $ fromUpAF w
+                 | otherwise = Nothing
+#if __GLASGOW_HASKELL__ >= 700
+{-# INLINABLE fromUpHexDigit #-}
+#endif
+
+unsafeFromUpHexDigit :: Num a => Word8 -> a
+unsafeFromUpHexDigit w | w < ascii 'A' = unsafeFromDigit w
+                       | otherwise     = fromUpAF w
+{-# INLINE unsafeFromUpHexDigit #-}
+
+isHexDigit :: Word8 -> Bool
+isHexDigit w = isDigit w || isUpAF w || isLowAF w
+
+fromHexDigit :: Num a => Word8 -> Maybe a
+fromHexDigit w | isDigit w = Just $ unsafeFromDigit w
+               | isUpAF w  = Just $ fromUpAF w
+               | isLowAF w = Just $ fromLowAF w
+               | otherwise = Nothing
+#if __GLASGOW_HASKELL__ >= 700
+{-# INLINABLE fromHexDigit #-}
+#endif
+
+unsafeFromHexDigit :: Num a => Word8 -> a
+unsafeFromHexDigit w | w < ascii 'A' = unsafeFromDigit w
+                     | w < ascii 'a' = fromUpAF w
+                     | otherwise     = fromLowAF w
+{-# INLINE unsafeFromHexDigit #-}
+

@@ -1,30 +1,30 @@-Copyright Michael Snoyman 2011--All rights reserved.--Redistribution and use in source and binary forms, with or without-modification, are permitted provided that the following conditions are met:--    * Redistributions of source code must retain the above copyright-      notice, this list of conditions and the following disclaimer.--    * 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.--    * Neither the name of Michael Snoyman nor the names of other-      contributors may be used to endorse or promote products derived-      from this software without specific prior written permission.--THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 COPYRIGHT-OWNER 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.+Copyright Michael Snoyman 2011
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * 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.
+
+    * Neither the name of Michael Snoyman nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 COPYRIGHT
+OWNER 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.

@@ -1,3 +1,3 @@-#!/usr/bin/env runhaskell-import Distribution.Simple-main = defaultMain+#!/usr/bin/env runhaskell
+import Distribution.Simple
+main = defaultMain

@@ -1,20 +1,20 @@-Name:                ascii-Version:             0.0.2.2-Synopsis:            Type-safe, bytestring-based ASCII values.-License:             BSD3-License-file:        LICENSE-Author:              Michael Snoyman-Maintainer:          michael@snoyman.com-Stability:           Stable-Category:            Data-Build-type:          Simple-Cabal-version:       >=1.2--Library-  Exposed-modules:     Data.Ascii-  Build-depends:       base             >= 4             && < 5-                     , bytestring       >= 0.9           && < 0.10-                     , text             >= 0.11          && < 0.12-                     , blaze-builder    >= 0.2.1.4       && < 0.4-                     , case-insensitive >= 0.2           && < 0.4-  Ghc-options:         -Wall+Name:                ascii
+Version:             0.0.3
+Synopsis:            Type-safe, bytestring-based ASCII values.
+License:             BSD3
+License-file:        LICENSE
+Author:              Michael Snoyman
+Maintainer:          michael@snoyman.com
+Stability:           Stable
+Category:            Data
+Build-type:          Simple
+Cabal-version:       >=1.2
+
+Library
+  Exposed-modules:     Data.Ascii
+  Build-depends:       base             >= 4             && < 5
+                     , bytestring       >= 0.9           && < 0.10
+                     , text             >= 0.11          && < 0.12
+                     , blaze-builder    >= 0.2.1.4       && < 0.4
+                     , case-insensitive >= 0.2           && < 0.4
+  Ghc-options:         -Wall