Use MonadIO. Bumped version to 2.4.0.0.

Author: svenpanne

OpenGLRaw.cabal

@@ -1,5 +1,5 @@
 name: OpenGLRaw
-version: 2.3.0.1
+version: 2.4.0.0
 synopsis: A raw binding for the OpenGL graphics system
 description:
   OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system and
@@ -20,6 +20,7 @@ description:
   and <http://www.opengl.org/registry/>.
 homepage: http://www.haskell.org/haskellwiki/Opengl
 bug-reports: https://github.com/haskell-opengl/OpenGLRaw/issues
+copyright: Copyright (C) 2009-2015 Sven Panne
 license: BSD3
 license-file: LICENSE
 author: Sven Panne
@@ -574,7 +575,9 @@ library
     cbits/HsOpenGLRaw.c
   hs-source-dirs: src
   include-dirs: include
-  build-depends: base >= 3 && < 5
+  build-depends:
+    base         >= 4   && < 5,
+    transformers >= 0.2 && < 0.5
   default-language: Haskell2010
   ghc-options: -Wall
   other-extensions: CPP

RegistryProcessor/RegistryProcessor.cabal

@@ -21,7 +21,12 @@ cabal-version: >=1.10
 executable RegistryProcessor
   main-is: Main.hs
   other-modules: DeclarationParser ManPages MangledRegistry Registry
-  build-depends: base >= 3 && < 5, containers >= 0.5 && < 0.6, hxt >= 9.3, directory, filepath
+  build-depends:
+    base       >= 4   && < 5,
+    containers >= 0.3 && < 0.6,
+    hxt        >= 9.3 && < 9.4,
+    directory  >= 1.0 && < 1.3,
+    filepath   >= 1.0 && < 1.4
   hs-source-dirs: src
   default-language: Haskell2010
   ghc-options: -Wall

RegistryProcessor/src/Main.hs

@@ -65,6 +65,7 @@ printFunctions api registry = do
     SI.hPutStrLn h "-- Make the foreign imports happy."
     SI.hPutStrLn h "import Foreign.C.Types"
     SI.hPutStrLn h ""
+    SI.hPutStrLn h "import Control.Monad.IO.Class ( MonadIO(..) )"
     SI.hPutStrLn h "import Foreign.Marshal.Error ( throwIf )"
     SI.hPutStrLn h "import Foreign.Ptr ( Ptr, FunPtr, nullFunPtr )"
     SI.hPutStrLn h "import System.IO.Unsafe ( unsafePerformIO )"
@@ -312,8 +313,9 @@ showCommand api c =
   showString man .
 
   showString (name ++ "\n") .
-  showString ("  :: " ++ signature True) .
-  showString (name ++ " = " ++ dyn_name ++ " " ++ ptr_name ++ "\n\n") .
+  showString ("  :: MonadIO m\n") .
+  showString ("  => " ++ signature True) .
+  showString (name ++ args ++ " = liftIO $ " ++ dyn_name ++ " " ++ ptr_name ++ args ++ "\n\n") .
 
   showString ("foreign import CALLCONV \"dynamic\" " ++ dyn_name ++ "\n" ++
               "  :: FunPtr (" ++ compactSignature ++ ")\n" ++
@@ -341,11 +343,14 @@ showCommand api c =
                 [_] ->  "-- | Manual page for "  ++ links
                 _   ->  "-- | Manual pages for " ++ links
         renderURL (u, l) = "<" ++ u ++ " " ++ l ++ ">"
+        args = concat [" v" ++ show i | i <- [1 .. length (paramTypes c)]]
 
 showSignatureElement :: Bool -> Bool -> SignatureElement -> String
 showSignatureElement withComment isResult sigElem = el ++ comment
-  where el | isResult  = "IO " ++ showsPrec 11 sigElem ""
+  where el | isResult  = monad ++ " " ++ showsPrec 11 sigElem ""
            | otherwise = show sigElem
+        monad | withComment = "m"
+              | otherwise = "IO"
         comment | withComment = showComment name sigElem
                 | otherwise   = ""
         name | isResult  = ""