Add Specialize pragmas back in.

Author: angerman

src/Data/BitCode/Writer/Monad.hs

@@ -139,8 +139,8 @@ instance ( Semigroup (f Word8)
                     go' !n !b !w = (shift w (n-8), b .|. shift w n)
     in r
 
---  {-# SPECIALIZE instance Monoid (Stream Seq a) #-}
---   {-# SPECIALIZE instance Monoid (Stream [] a) #-}
+  {-# SPECIALIZE instance Semigroup (Stream Seq a) #-}
+  {-# SPECIALIZE instance Semigroup (Stream [] a) #-}
 
 instance ( Semigroup (f Word8)
          , Monoid (f Word8)
@@ -173,20 +173,23 @@ instance ( Semigroup (f Word8)
                     go' !n !b !w = (shift w (n-8), b .|. shift w n)
     in r
 
-
+  {-# SPECIALIZE instance Monoid (Stream Seq a) #-}
+  {-# SPECIALIZE instance Monoid (Stream [] a) #-}
 
 instance Semigroup (Streams f a) where
   lhs <> (Streams _ 0) = lhs
   (Streams _ 0) <> rhs = rhs
   (Streams ss1 p1) <> (Streams ss2 p2) = Streams (ss1 <> ss2) (p1 + p2)
---  {-# SPECIALIZE instance Monoid (Streams Seq a) #-}
---  {-# SPECIALIZE instance Monoid (Streams [] a) #-}
+
+  {-# SPECIALIZE instance Semigroup (Streams Seq a) #-}
+  {-# SPECIALIZE instance Semigroup (Streams [] a) #-}
 
 instance Monoid (Streams f a) where
-  lhs `mappend` (Streams _ 0) = lhs
-  (Streams _ 0) `mappend` rhs = rhs
-  (Streams ss1 p1) `mappend` (Streams ss2 p2) = Streams (ss1 <> ss2) (p1 + p2)
   mempty = Streams mempty 0
+  mappend = (<>)
+
+  {-# SPECIALIZE instance Monoid (Streams Seq a) #-}
+  {-# SPECIALIZE instance Monoid (Streams [] a) #-}
 
 -- mappend is not cheap here.
 type ListStream = Stream [] Word8
@@ -195,12 +198,12 @@ type SeqStreams = Streams Seq  Word8
 toListStream :: Foldable f => Stream f a -> Stream [] a
 toListStream (S w b p) = S (toList w) b p
 
--- {-# SPECIALIZE toListStream :: Stream Seq a -> Stream [] a #-}
+{-# SPECIALIZE toListStream :: Stream Seq a -> Stream [] a #-}
 
 runStreams :: Streams Seq a -> Stream Seq a
 runStreams (Streams ss _) = foldl' mappend mempty ss
 
--- {-# SPECIALIZE runStreams :: Streams Seq a -> Stream Seq a #-}
+{-# SPECIALIZE runStreams :: Streams Seq a -> Stream Seq a #-}
 
 data BitstreamState = BitstreamState !SeqStreams !Position
 
@@ -228,11 +231,11 @@ streams w b p
   | p == 0 = mempty
   | otherwise = Streams (pure $ S (Seq.fromList . toList $ w) b p) p
 
--- {-# SPECIALIZE streams :: [Word8] -> Buff -> Position -> SeqStreams #-}
+{-# SPECIALIZE streams :: [Word8] -> Buff -> Position -> SeqStreams #-}
 bitstream :: Foldable f => f Word8 -> Buff -> Int -> Bitstream ()
 bitstream w b p = Bitstream $ modify' $ \(BitstreamState ss p') -> BitstreamState (ss <> streams w b p) (p + p')
 
---{-# SPECIALIZE bitstream :: [Word8] -> Buff -> Int -> Bitstream () #-}
+{-# SPECIALIZE bitstream :: [Word8] -> Buff -> Int -> Bitstream () #-}
 -- Monadic Bitstream API
 
 withOffset :: Int -> Bitstream a -> Bitstream a