haskell/encoding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with mtl-2

Browse Source 
Ignore-this: 867097705abf2d63e427858078720dc4
This took really long, sorry everybody :/

darcs-hash:20110403123836-a4fee-c6af95e58267ca7e215e24bee250d0bbae13a1d4
This commit is contained in:
Henning Guenther 2011-04-03 05:38:36 -07:00
parent a3a24776a3
commit 9a7f52ab7a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Encoding/ByteSink.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE FlexibleInstances,FlexibleContexts,MultiParamTypeClasses #-} {-# LANGUAGE FlexibleInstances,FlexibleContexts,MultiParamTypeClasses,CPP #-}
module Data.Encoding.ByteSink where module Data.Encoding.ByteSink where
import Data.Encoding.Exception import Data.Encoding.Exception
@ -101,10 +101,12 @@ instance ByteSink PutME where
pushWord64be w = PutME $ Right (putWord64be w,()) pushWord64be w = PutME $ Right (putWord64be w,())
pushWord64le w = PutME $ Right (putWord64le w,()) pushWord64le w = PutME $ Right (putWord64le w,())
#ifndef MIN_VERSION_mtl(2,0,0,0)
instance Monad (Either EncodingException) where instance Monad (Either EncodingException) where
return x = Right x return x = Right x
Left err >>= g = Left err Left err >>= g = Left err
Right x >>= g = g x Right x >>= g = g x
#endif
instance Throws EncodingException (State (Seq Char)) where instance Throws EncodingException (State (Seq Char)) where
throwException = throw throwException = throw

4
Data/Encoding/ByteSource.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE FlexibleInstances,FlexibleContexts,MultiParamTypeClasses #-} {-# LANGUAGE FlexibleInstances,FlexibleContexts,MultiParamTypeClasses,CPP #-}
module Data.Encoding.ByteSource where module Data.Encoding.ByteSource where
import Data.Encoding.Exception import Data.Encoding.Exception
@ -121,10 +121,12 @@ instance ByteSource (State [Char]) where
put chs put chs
return res return res
#ifndef MIN_VERSION_mtl(2,0,0,0)
instance Monad (Either DecodingException) where instance Monad (Either DecodingException) where
return = Right return = Right
(Left err) >>= g = Left err (Left err) >>= g = Left err
(Right x) >>= g = g x (Right x) >>= g = g x
#endif
instance ByteSource (StateT [Char] (Either DecodingException)) where instance ByteSource (StateT [Char] (Either DecodingException)) where
sourceEmpty = gets null sourceEmpty = gets null