git.iko.soy/Idris-dev
on master help sign in
Merge pull request #364 from Ralith/base-version-cleanup

Remove old ifdefs for supporting base<4 since we require base>=4

commit8dedc4b81ee036c5719eda53c21c3ae12f3c4d89 authorEdwin Brady <edwin.brady@gmail.com> dateFri 28 Jun 2013, 07:26 (13 years ago) parentbe36353f8401d5
2 files changed−14
compare with master
unifiedsplit
src/IRTS/CodegenCommon.hs−7 src/Util/System.hs−7
src/IRTS/CodegenCommon.hs−7
@@ -1,5 +1,3 @@
1−{-# LANGUAGE CPP #-}
2−
31module IRTS.CodegenCommon where
42
53import Core.TT
@@ -14,9 +12,4 @@ data OutputType = Raw | Object | Executable deriving (Eq, Show)
1412environment :: String -> IO (Maybe String)
1513environment x = Control.Exception.catch (do e <- getEnv x
1614 return (Just e))
17−#if MIN_VERSION_base(4,0,0)
1815 (\y-> do return (y::SomeException); return Nothing)
19−#endif
20−#if !MIN_VERSION_base(4,0,0)
21− (\_-> return Nothing)
22−#endif
src/Util/System.hs−7
@@ -15,22 +15,15 @@ import System.FilePath ((</>), addTrailingPathSeparator, normalise)
1515import System.Environment
1616import System.IO
1717import System.IO.Error
18−#if MIN_VERSION_base(4,0,0)
1918import Control.Exception as CE
20−#endif
2119
2220import Paths_idris
2321
24−#if MIN_VERSION_base(4,0,0)
2522catchIO :: IO a -> (IOError -> IO a) -> IO a
2623catchIO = CE.catch
2724
2825throwIO :: IOError -> IO a
2926throwIO = CE.throw
30−#else
31−catchIO = catch
32−throwIO = throw
33−#endif
3427
3528
3629