X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Futils%2FIOEnv.hs;h=ba98b086918d808e392f7ce48f0767270d93c506;hb=869feb6a8105f34092a1ae1e755dffb69a565c85;hp=0acd285cb75684f5dbeba52585896b3c05c6d13d;hpb=2b670fe37bb884ca67c3da0b9a0ce796b613968b;p=ghc-hetmet.git

diff --git a/compiler/utils/IOEnv.hs b/compiler/utils/IOEnv.hs
index 0acd285..ba98b08 100644
--- a/compiler/utils/IOEnv.hs
+++ b/compiler/utils/IOEnv.hs
@@ -1,10 +1,3 @@
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
 --
 -- (c) The University of Glasgow 2002-2006
 --
@@ -12,45 +5,46 @@
 --
 
 module IOEnv (
-	IOEnv,	-- Instance of Monad
+        IOEnv, -- Instance of Monad
 
-	-- Monad utilities
-	module MonadUtils,
+        -- Monad utilities
+        module MonadUtils,
 
-	-- Errors
-	failM, failWithM,
+        -- Errors
+        failM, failWithM,
 
-	-- Getting at the environment
-	getEnv, setEnv, updEnv,
+        -- Getting at the environment
+        getEnv, setEnv, updEnv,
 
-	runIOEnv, unsafeInterleaveM,			
-	tryM, tryAllM, tryMostM, fixM, 
+        runIOEnv, unsafeInterleaveM,
+        tryM, tryAllM, tryMostM, fixM,
 
-	-- I/O operations
-	IORef, newMutVar, readMutVar, writeMutVar, updMutVar
+        -- I/O operations
+        IORef, newMutVar, readMutVar, writeMutVar, updMutVar
   ) where
-#include "HsVersions.h"
 
-import Panic		( try, tryUser, tryMost, Exception(..) )
+import Panic            ( try, tryUser, tryMost, Exception(..) )
 
-import Data.IORef	( IORef, newIORef, readIORef, writeIORef, modifyIORef )
-import System.IO.Unsafe	( unsafeInterleaveIO )
-import System.IO	( fixIO )
+import Data.IORef       ( IORef, newIORef, readIORef, writeIORef, modifyIORef )
+import System.IO.Unsafe ( unsafeInterleaveIO )
+import System.IO        ( fixIO )
 import MonadUtils
 
 ----------------------------------------------------------------------
---		Defining the monad type
+-- Defining the monad type
 ----------------------------------------------------------------------
 
 
 newtype IOEnv env a = IOEnv (env -> IO a)
+
+unIOEnv :: IOEnv env a -> (env -> IO a)
 unIOEnv (IOEnv m) = m
 
 instance Monad (IOEnv m) where
     (>>=)  = thenM
     (>>)   = thenM_
     return = returnM
-    fail s = failM	-- Ignore the string
+    fail _ = failM -- Ignore the string
 
 instance Applicative (IOEnv m) where
     pure = returnM
@@ -60,25 +54,25 @@ instance Functor (IOEnv m) where
     fmap f (IOEnv m) = IOEnv (\ env -> fmap f (m env))
 
 returnM :: a -> IOEnv env a
-returnM a = IOEnv (\ env -> return a)
+returnM a = IOEnv (\ _ -> return a)
 
 thenM :: IOEnv env a -> (a -> IOEnv env b) -> IOEnv env b
 thenM (IOEnv m) f = IOEnv (\ env -> do { r <- m env ;
-				       unIOEnv (f r) env })
+                                         unIOEnv (f r) env })
 
 thenM_ :: IOEnv env a -> IOEnv env b -> IOEnv env b
 thenM_ (IOEnv m) f = IOEnv (\ env -> do { m env ; unIOEnv f env })
 
 failM :: IOEnv env a
-failM = IOEnv (\ env -> ioError (userError "IOEnv failure"))
+failM = IOEnv (\ _ -> ioError (userError "IOEnv failure"))
 
 failWithM :: String -> IOEnv env a
-failWithM s = IOEnv (\ env -> ioError (userError s))
+failWithM s = IOEnv (\ _ -> ioError (userError s))
 
 
 
 ----------------------------------------------------------------------
---	Fundmantal combinators specific to the monad
+-- Fundmantal combinators specific to the monad
 ----------------------------------------------------------------------
 
 
@@ -106,7 +100,7 @@ tryM :: IOEnv env r -> IOEnv env (Either Exception r)
 --
 -- The idea is that errors in the program being compiled will give rise
 -- to UserErrors.  But, say, pattern-match failures in GHC itself should
--- not be caught here, else they'll be reported as errors in the program 
+-- not be caught here, else they'll be reported as errors in the program
 -- begin compiled!
 tryM (IOEnv thing) = IOEnv (\ env -> tryUser (thing env))
 
@@ -125,11 +119,11 @@ unsafeInterleaveM (IOEnv m) = IOEnv (\ env -> unsafeInterleaveIO (m env))
 
 
 ----------------------------------------------------------------------
---	Accessing input/output
+-- Accessing input/output
 ----------------------------------------------------------------------
 
 instance MonadIO (IOEnv env) where
-    liftIO io = IOEnv (\ env -> io)
+    liftIO io = IOEnv (\ _ -> io)
 
 newMutVar :: a -> IOEnv env (IORef a)
 newMutVar val = liftIO (newIORef val)
@@ -145,7 +139,7 @@ updMutVar var upd = liftIO (modifyIORef var upd)
 
 
 ----------------------------------------------------------------------
---	Accessing the environment
+-- Accessing the environment
 ----------------------------------------------------------------------
 
 getEnv :: IOEnv env env
@@ -155,7 +149,7 @@ getEnv = IOEnv (\ env -> return env)
 -- | Perform a computation with a different environment
 setEnv :: env' -> IOEnv env' a -> IOEnv env a
 {-# INLINE setEnv #-}
-setEnv new_env (IOEnv m) = IOEnv (\ env -> m new_env)
+setEnv new_env (IOEnv m) = IOEnv (\ _ -> m new_env)
 
 -- | Perform a computation with an altered environment
 updEnv :: (env -> env') -> IOEnv env' a -> IOEnv env a
@@ -164,8 +158,8 @@ updEnv upd (IOEnv m) = IOEnv (\ env -> m (upd env))
 
 
 ----------------------------------------------------------------------
---	Standard combinators, but specialised for this monad
---			(for efficiency)
+-- Standard combinators, but specialised for this monad
+-- (for efficiency)
 ----------------------------------------------------------------------
 
 {-# -- SPECIALIZE mapM          :: (a -> IOEnv env b) -> [a] -> IOEnv env [b] #-}