diff options
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/MonadUtils.hs | 24 | ||||
| -rw-r--r-- | compiler/utils/StringBuffer.lhs | 5 |
2 files changed, 15 insertions, 14 deletions
diff --git a/compiler/utils/MonadUtils.hs b/compiler/utils/MonadUtils.hs index dc54620c20..75a88dfcbd 100644 --- a/compiler/utils/MonadUtils.hs +++ b/compiler/utils/MonadUtils.hs @@ -27,16 +27,16 @@ module MonadUtils import Outputable ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- -- Detection of available libraries ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- -- we don't depend on MTL for now #define HAVE_MTL 0 ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- -- Imports ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- import Maybes @@ -47,9 +47,9 @@ import Control.Monad.Trans import Control.Monad import Control.Monad.Fix ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- -- The ID monad ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- newtype ID a = ID a instance Monad ID where @@ -61,9 +61,9 @@ instance Monad ID where runID :: ID a -> a runID (ID x) = x ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- -- MTL ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- #if !HAVE_MTL @@ -73,10 +73,10 @@ class Monad m => MonadIO m where instance MonadIO IO where liftIO = id #endif ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- -- Lift combinators -- These are used throughout the compiler ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- -- | Lift an 'IO' operation with 1 argument into another monad liftIO1 :: MonadIO m => (a -> IO b) -> a -> m b @@ -94,10 +94,10 @@ liftIO3 = ((.).((.).(.))) liftIO liftIO4 :: MonadIO m => (a -> b -> c -> d -> IO e) -> a -> b -> c -> d -> m e liftIO4 = (((.).(.)).((.).(.))) liftIO ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- -- Common functions -- These are used throughout the compiler ----------------------------------------------------------------------------------------- +------------------------------------------------------------------------------- zipWith3M :: Monad m => (a -> b -> c -> m d) -> [a] -> [b] -> [c] -> m [d] zipWith3M _ [] _ _ = return [] diff --git a/compiler/utils/StringBuffer.lhs b/compiler/utils/StringBuffer.lhs index 2b3b775791..869cb8ac84 100644 --- a/compiler/utils/StringBuffer.lhs +++ b/compiler/utils/StringBuffer.lhs @@ -138,8 +138,9 @@ appendStringBuffers sb1 sb2 calcLen sb = len sb - cur sb size = sb1_len + sb2_len -stringToStringBuffer :: String -> IO StringBuffer -stringToStringBuffer str = do +stringToStringBuffer :: String -> StringBuffer +stringToStringBuffer str = + unsafePerformIO $ do let size = utf8EncodedLength str buf <- mallocForeignPtrArray (size+3) withForeignPtr buf $ \ptr -> do |