wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update plugins to support GHC >= 7.2 (via conditional compilation)

Browse Source
This commit is contained in:
Brian Victor 2012-03-19 18:20:05 +00:00
parent c90676d8f7
commit c0b4642cbc
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/System/Plugins/Load.hs
View File

@ -84,7 +84,9 @@ import Control.Monad ( when, filterM, liftM )
import System.Directory ( doesFileExist, removeFile ) import System.Directory ( doesFileExist, removeFile )
import Foreign.C.String ( CString, withCString, peekCString ) import Foreign.C.String ( CString, withCString, peekCString )
#if !MIN_VERSION_ghc(7,2,0)
import GHC ( defaultCallbacks ) import GHC ( defaultCallbacks )
#endif
import GHC.Ptr ( Ptr(..), nullPtr ) import GHC.Ptr ( Ptr(..), nullPtr )
import GHC.Exts ( addrToHValue# ) import GHC.Exts ( addrToHValue# )
import GHC.Prim ( unsafeCoerce# ) import GHC.Prim ( unsafeCoerce# )
@ -99,7 +101,11 @@ ifaceModuleName = moduleNameString . moduleName . mi_module
readBinIface' :: FilePath -> IO ModIface readBinIface' :: FilePath -> IO ModIface
readBinIface' hi_path = do readBinIface' hi_path = do
-- kludgy as hell -- kludgy as hell
#if MIN_VERSION_ghc(7,2,0)
e <- newHscEnv undefined
#else
e <- newHscEnv defaultCallbacks undefined e <- newHscEnv defaultCallbacks undefined
#endif
initTcRnIf 'r' e undefined undefined (readBinIface IgnoreHiWay QuietBinIFaceReading hi_path) initTcRnIf 'r' e undefined undefined (readBinIface IgnoreHiWay QuietBinIFaceReading hi_path)
-- TODO need a loadPackage p package.conf :: IO () primitive -- TODO need a loadPackage p package.conf :: IO () primitive
@ -679,7 +685,11 @@ loadDepends obj incpaths = do
-- and find some packages to load, as well. -- and find some packages to load, as well.
let ps = dep_pkgs ds let ps = dep_pkgs ds
#if MIN_VERSION_ghc(7,2,0)
ps' <- filterM loaded . map packageIdString . nub $ map fst ps
#else
ps' <- filterM loaded . map packageIdString . nub $ ps ps' <- filterM loaded . map packageIdString . nub $ ps
#endif
#if DEBUG #if DEBUG
when (not (null ps')) $ when (not (null ps')) $