Ticket #64: show-read-Char-Word8.dpatch

1 patch for repository http://code.haskell.org/vector:

Fri Oct 14 15:47:45 CEST 2011  Bas van Dijk <v.dijk.bas@gmail.com>
  * Define specific Show and Read instances for vectors of Chars and Word8s that show and read like Strings

New patches:

[Define specific Show and Read instances for vectors of Chars and Word8s that show and read like Strings
Bas van Dijk <v.dijk.bas@gmail.com>**20111014134745
 Ignore-this: 4f1fa503f2f9ffd58c38ce021c7dd3cf
] {
hunk ./Data/Vector.hs 1
-{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeFamilies, Rank2Types #-}
+{-# LANGUAGE FlexibleInstances
+           , MultiParamTypeClasses
+           , TypeFamilies
+           , Rank2Types
+           , OverlappingInstances
+  #-}
 
 -- |
 -- Module      : Data.Vector
hunk ./Data/Vector.hs 187
 import Data.Typeable ( Typeable )
 import Data.Data     ( Data(..) )
 import Text.Read     ( Read(..), readListPrecDefault )
+import Data.Word     ( Word8 )
 
 import Data.Monoid   ( Monoid(..) )
 import qualified Control.Applicative as Applicative
hunk ./Data/Vector.hs 194
 import qualified Data.Foldable as Foldable
 import qualified Data.Traversable as Traversable
 
+
 -- | Boxed vectors, supporting efficient slicing.
 data Vector a = Vector {-# UNPACK #-} !Int
                        {-# UNPACK #-} !Int
hunk ./Data/Vector.hs 204
 instance Show a => Show (Vector a) where
   showsPrec = G.showsPrec
 
+instance Show (Vector Char) where
+  showsPrec = G.showsPrecChar
+
+instance Show (Vector Word8) where
+  showsPrec = G.showsPrecWord8
+
 instance Read a => Read (Vector a) where
   readPrec = G.readPrec
   readListPrec = readListPrecDefault
hunk ./Data/Vector.hs 214
 
+instance Read (Vector Char) where
+  readPrec = G.readPrecChar
+
+instance Read (Vector Word8) where
+  readPrec = G.readPrecWord8
+
 instance Data a => Data (Vector a) where
   gfoldl       = G.gfoldl
   toConstr _   = error "toConstr"
hunk ./Data/Vector/Generic.hs 157
   eq, cmp,
 
   -- ** Show and Read
-  showsPrec, readPrec,
+  showsPrec,      readPrec,
+  showsPrecChar,  readPrecChar,
+  showsPrecWord8, readPrecWord8,
 
   -- ** @Data@ and @Typeable@
   gfoldl, dataCast, mkType
hunk ./Data/Vector/Generic.hs 198
                         mapM, mapM_, sequence, sequence_,
                         showsPrec )
 
+import qualified Text.Show ( showsPrec )
+
 import qualified Text.Read as Read
hunk ./Data/Vector/Generic.hs 201
+import Data.Functor ( (<$>) )
+import Data.Word    ( Word8 )
+import Data.Char    ( ord )
+import GHC.Base     ( unsafeChr )
+
 import Data.Typeable ( Typeable1, gcast1 )
 
 #include "vector.h"
hunk ./Data/Vector/Generic.hs 2007
 {-# INLINE showsPrec #-}
 showsPrec p v = showParen (p > 10) $ showString "fromList " . shows (toList v)
 
+-- | Generic definition of 'Prelude.showsPrec' 
+-- but shows the vector as a 'String'.
+showsPrecChar :: (Vector v Char) => Int -> v Char -> ShowS
+{-# INLINE showsPrecChar #-}
+showsPrecChar p v = Text.Show.showsPrec p (toList v)
+
+-- | Generic definition of 'Prelude.showsPrec' 
+-- but shows the vector of @'Word8's@ as a 'String'.
+showsPrecWord8 :: (Vector v Word8, Vector v Char) => Int -> v Word8 -> ShowS
+{-# INLINE showsPrecWord8 #-}
+showsPrecWord8 p = showsPrecChar p . map w2c
+
+-- | Conversion between 'Word8' and 'Char'. Should compile to a no-op.
+w2c :: Word8 -> Char
+w2c = unsafeChr . fromIntegral
+{-# INLINE w2c #-}
+
+-- | Unsafe conversion between 'Char' and 'Word8'. This is a no-op and
+-- silently truncates to 8 bits Chars > '\255'.
+c2w :: Char -> Word8
+c2w = fromIntegral . ord
+{-# INLINE c2w #-}
+
+-- | Generic definition of 'Text.Read.readPrec'
+-- but reads to vector as a 'String'.
+readPrecChar :: (Vector v Char) => Read.ReadPrec (v Char)
+{-# INLINE readPrecChar #-}
+readPrecChar = fromList <$> Read.readPrec
+
+-- | Generic definition of 'Text.Read.readPrec'
+-- but reads to vector of @'Word8's@ as a 'String'.
+--
+-- Silently truncates to 8 bits Chars > '\255'.
+readPrecWord8 :: (Vector v Word8, Vector v Char) => Read.ReadPrec (v Word8)
+{-# INLINE readPrecWord8 #-}
+readPrecWord8 = map c2w <$> readPrecChar
+
 -- | Generic definition of 'Text.Read.readPrec'
 readPrec :: (Vector v a, Read a) => Read.ReadPrec (v a)
 {-# INLINE readPrec #-}
hunk ./Data/Vector/Generic.hs 2049
 readPrec = Read.parens $ Read.prec 10 $ do
   Read.Ident "fromList" <- Read.lexP
-  xs <- Read.readPrec
-  return (fromList xs)
+  fromList <$> Read.readPrec
 
 -- Data and Typeable
 -- -----------------
hunk ./Data/Vector/Primitive.hs 1
-{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeFamilies, ScopedTypeVariables, Rank2Types #-}
+{-# LANGUAGE FlexibleInstances
+           , MultiParamTypeClasses
+           , TypeFamilies
+           , ScopedTypeVariables
+           , Rank2Types
+           , OverlappingInstances
+  #-}
 
 -- |
 -- Module      : Data.Vector.Primitive
hunk ./Data/Vector/Primitive.hs 171
 
 import Data.Typeable ( Typeable )
 import Data.Data     ( Data(..) )
+import Data.Word     ( Word8 )
 import Text.Read     ( Read(..), readListPrecDefault )
 
 import Data.Monoid   ( Monoid(..) )
hunk ./Data/Vector/Primitive.hs 185
 instance (Show a, Prim a) => Show (Vector a) where
   showsPrec = G.showsPrec
 
+instance Show (Vector Char) where
+  showsPrec = G.showsPrecChar
+
+instance Show (Vector Word8) where
+  showsPrec = G.showsPrecWord8
+
 instance (Read a, Prim a) => Read (Vector a) where
   readPrec = G.readPrec
   readListPrec = readListPrecDefault
hunk ./Data/Vector/Primitive.hs 195
 
+instance Read (Vector Char) where
+  readPrec = G.readPrecChar
+
+instance Read (Vector Word8) where
+  readPrec = G.readPrecWord8
+
 instance (Data a, Prim a) => Data (Vector a) where
   gfoldl       = G.gfoldl
   toConstr _   = error "toConstr"
hunk ./Data/Vector/Storable.hs 1
-{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances, TypeFamilies, Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE MultiParamTypeClasses
+           , FlexibleInstances
+           , TypeFamilies
+           , Rank2Types
+           , ScopedTypeVariables
+           , OverlappingInstances
+  #-}
 
 -- |
 -- Module      : Data.Vector.Storable
hunk ./Data/Vector/Storable.hs 176
 
 import Data.Typeable ( Typeable )
 import Data.Data     ( Data(..) )
+import Data.Word     ( Word8 )
 import Text.Read     ( Read(..), readListPrecDefault )
 
 import Data.Monoid   ( Monoid(..) )
hunk ./Data/Vector/Storable.hs 191
 instance (Show a, Storable a) => Show (Vector a) where
   showsPrec = G.showsPrec
 
+instance Show (Vector Char) where
+  showsPrec = G.showsPrecChar
+
+instance Show (Vector Word8) where
+  showsPrec = G.showsPrecWord8
+
 instance (Read a, Storable a) => Read (Vector a) where
   readPrec = G.readPrec
   readListPrec = readListPrecDefault
hunk ./Data/Vector/Storable.hs 201
 
+instance Read (Vector Char) where
+  readPrec = G.readPrecChar
+
+instance Read (Vector Word8) where
+  readPrec = G.readPrecWord8
+
 instance (Data a, Storable a) => Data (Vector a) where
   gfoldl       = G.gfoldl
   toConstr _   = error "toConstr"
hunk ./Data/Vector/Unboxed.hs 1
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE Rank2Types, FlexibleInstances, OverlappingInstances #-}
 
 -- |
 -- Module      : Data.Vector.Unboxed
hunk ./Data/Vector/Unboxed.hs 191
 
 import Data.Monoid   ( Monoid(..) )
 
+import Data.Word     ( Word8 )
+
 #include "vector.h"
 
 -- See http://trac.haskell.org/vector/ticket/12
hunk ./Data/Vector/Unboxed.hs 233
 instance (Show a, Unbox a) => Show (Vector a) where
   showsPrec = G.showsPrec
 
+instance Show (Vector Char) where
+  showsPrec = G.showsPrecChar
+
+instance Show (Vector Word8) where
+  showsPrec = G.showsPrecWord8
+
 instance (Read a, Unbox a) => Read (Vector a) where
   readPrec = G.readPrec
   readListPrec = readListPrecDefault
hunk ./Data/Vector/Unboxed.hs 243
 
+instance Read (Vector Char) where
+  readPrec = G.readPrecChar
+
+instance Read (Vector Word8) where
+  readPrec = G.readPrecWord8
+
 -- Length information
 -- ------------------
 
}

Context:

[Added RULES that translates "unsafeFromForeignPtr fp 0 n" to "unsafeFromForeignPtr0 fp n"
Bas van Dijk <v.dijk.bas@gmail.com>**20110930134731
 Ignore-this: 7ca5f9f0a7515d2208464ecff411b0b6
] 
[Add unsafeFromForeignPtr0 and unsafeToForeignPtr0 to Data.Vector.Storable.Mutable
Bas van Dijk <v.dijk.bas@gmail.com>**20110930082125
 Ignore-this: e2cb96f3f32c6b220c9553dcd65872b1
] 
[Add unsafeFromForeignPtr0 and unsafeToForeignPtr0 to Data.Vector.Storable
Bas van Dijk <v.dijk.bas@gmail.com>**20110930081100
 Ignore-this: 427d2d410cf5c64cbec429337e1c3e8e
] 
[Bump version
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20111013204447
 Ignore-this: a4117a951aa79211f1991331d73f4e11
] 
[Changelog
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110830193201
 Ignore-this: 6a72e542a0132600af9b4a1290c5ebc9
] 
[Require primitive-0.4.0.1
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110830193147
 Ignore-this: de70696c2fa670f5d5a50b732827800a
] 
[Bump version number
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110830193136
 Ignore-this: a4f64c244b926d6e14df34912af8e32e
] 
[Add construct and constructN to Safe modules
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110830192509
 Ignore-this: 45c293fbcf754ed87badb179a335f762
] 
[Add MonadPlus instance
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110830192347
 Ignore-this: 5d1b36db855beaf9092107f60d3f7ed6
] 
[TAG 0.8
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110829001717
 Ignore-this: b997d863aaacb77b8bf1ff653b42e096
] 
[Add tests
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110829001208
 Ignore-this: 23b8ae73433bdfc761c9f0657b1a09c7
] 
[Follow changes in primitive
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110828104527
 Ignore-this: 5a7db808ef443772b3b08f63b990ff03
] 
[Export mstream and mstreamR
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110828102107
 Ignore-this: fb7bea8de613bbc4bf71f0b8c661959b
] 
[Fix leftover conflicts
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110827232146
 Ignore-this: 5199073ea0d577b9860bceb6f75fd73f
] 
[Resolve conflict with stray patch
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110827231817
 Ignore-this: a81fd1a56855d96ce9d0eff991202c93
] 
[Bump versions of vector-tests
benl@ouroborus.net**20101014033852
 Ignore-this: 1b6bf632d2b41e5cdc2af34d6298cda4
] 
[Improve package description
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110826232244
 Ignore-this: ceda9feab9d7f204c3f0b11267aaf10
] 
[Improve comments
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110826232209
 Ignore-this: fe01df034e4223beadfb3f5ded6fe4
] 
[Mention Safe modules in the package description
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110826231210
 Ignore-this: 2ef9ec43b0cd5d2186327bec8266b0f0
] 
[Change comments in Safe modules
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110826230756
 Ignore-this: 9394772711908bf11c7ef28f58a60afa
] 
[Bump version to 0.8
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110826223236
 Ignore-this: 44c3a02908b6c6dbb0c3eae9fe7a5e36
] 
[Use mkTyCon3 if available
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110826222802
 Ignore-this: 115558d92fd394c770a8194361040538
] 
[Changelog
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110826220930
 Ignore-this: 26017ef444b4f753d59577eb23146f45
] 
[Follow containers convention in Show instances and add Read instances
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110826220427
 Ignore-this: 68484ab3169284a999f929b40a1a9130
] 
[Changelog
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110825221128
 Ignore-this: 5a37d7777b001ef7985f571b341a5648
] 
[Build tests with -O0 and -O2
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110825215522
 Ignore-this: 1faf722013f49ab58b04f6169c844cc2
] 
[Add tests
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110825214948
 Ignore-this: 2bada88c9462216ac23a8c1403649a92
] 
[Reorganise tests
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110825213103
 Ignore-this: cdb4f7ac54e93ca97195211e8cf3cb1f
] 
[Changelog
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110825212324
 Ignore-this: a2da154060c2962c2d4805b67996b03d
] 
[Slightly faster version of concatMap
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110823224759
 Ignore-this: 9575c568c957a95ca915d763014850cf
] 
[Add a seq
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110823224750
 Ignore-this: 37a1fc9ad603c7f24e5a310460933021
] 
[Add tests for constructN and constructrN
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110819234335
 Ignore-this: 4c24a192cffc8d7a71ba35cdbb543646
] 
[Add constructN and constructrN
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110819234052
 Ignore-this: 2416015edb789cddfc871d6a64bfe2b2
] 
[Significantly improve basicSet (based on a patch by Louis Wasserman)
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110819223644
 Ignore-this: 57a0c44481c4be66be5fbf70ddda2262
] 
[Make thaw and unsafeThaw fusible
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110819215440
 Ignore-this: d616612bd7b9b8733de6024c25a94416
] 
[Add New.runPrim
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110819215420
 Ignore-this: 5561cf4699f2e7718a0e940f085bc843
] 
[Fix Safe Haskell modules on 7.2.1
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110819211846
 Ignore-this: 9ee149f27925315fa8e443be882e7590
] 
[Fuse reverse
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110818223155
 Ignore-this: f63eb849684f5222de0ad0ecb3788654
] 
[Fix fixity of (!!) and (!)
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110818222159
 Ignore-this: 56a1348b61bfa3a75c76cc5e09592f4f
] 
[Add (!?) for streams and make vector (!?) fusible
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110818222115
 Ignore-this: 2a2c8801263922e40f77c3e1c03b9c3b
] 
[Use the Addr# field in ForeignPtr for Storable vectors
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110818221206
 Ignore-this: 4f162bff1ee98a5e982e046b0390355a
] 
[Fix vector-tests.cabal
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110818220827
 Ignore-this: 374a276c4c6fedc2add8a16c8a7880b8
] 
[Remove deprecated functions
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110817224752
 Ignore-this: b56b391e56bead2c158206c637504c14
] 
[Changelog
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110817223740
 Ignore-this: 4c65899a91ceccb369303a581509c719
] 
[Use new array copying primitives
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110817222820
 Ignore-this: 2944ee055836be9d67f91d005a9659e8
] 
[Require primitive 0.4 and replace deprecated primitives
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110817222319
 Ignore-this: 5bb273bdacd1fcc73c33c880c9622772
] 
[Changelog
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110812105754
 Ignore-this: e389c2fbff8e58829d2cbedec9d55989
] 
[Relax dependencies
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110812105641
 Ignore-this: 791bab1d9c3d73390cbe243753e5f4df
] 
[Expose Safe Haskell modules
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110812105555
 Ignore-this: 2e2744f74e368bbf83ea73d922afcd9f
] 
[Use Safe Haskell if GHC >= 7.2
David Terei <davidterei@gmail.com>**20110812000540
 Ignore-this: 404916c12b0079e5e42f9747fb502146
] 
[Add instances for Monad, Applicative, Alternative, Foldable, Traversable
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110625093340
 Ignore-this: 85f0e0b956099e3fcd1ac97317ae980c
] 
[Add Functor instance for boxed vectors
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110623200603
 Ignore-this: 8038c069d2a48fe827f62f332cce8a60
] 
[Bump version number
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110623200416
 Ignore-this: 3bf5875a1678331a26b06279a9a5d556
] 
[TAG 0.7.1
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20110618225609
 Ignore-this: 77ab304a0004a9e7038952644a62cb4
] 
Patch bundle hash:
60a677bb0f66c1b1dcfede7f8ff93ec136213564