Merge pull request #28 from YoshikuniJujo/master

new exception system

Author: audreyt

pugs-DrIFT/pugs-DrIFT.cabal

@@ -1,5 +1,5 @@
 name:                pugs-DrIFT
-version:             2.2.3.20120717
+version:             2.2.3.20120717.1
 synopsis:            DrIFT with pugs-specific rules.
 description:         DrIFT is a type sensitive preprocessor for Haskell. It extracts type declarations
                      and directives from modules. The directives cause rules to be fired on the parsed

pugs-DrIFT/src/ChaseImports.hs

@@ -29,8 +29,9 @@ import Data.List
 import qualified Unlit
 import Control.Monad
 import GenUtil
+import Control.Exception(catch, SomeException)
 
-try x = catch (x >>= return . Right) (return . Left)
+try x = catch (x >>= return . Right) (\e -> return $ Left (e :: SomeException))
 
 --- Split up input ---------------------------------------------------------
 splitString :: String -> String -> (String,String)

pugs-DrIFT/src/GenUtil.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE ScopedTypeVariables #-}
 
 --  $Id: GenUtil.hs,v 1.30 2004/12/01 23:58:27 john Exp $
 -- arch-tag: 835e46b7-8ffd-40a0-aaf9-326b7e347760
@@ -101,6 +102,7 @@ import qualified System.Environment as System
 import qualified System.Exit as System
 import System.Random(StdGen, newStdGen, Random(randomR))
 import System.Time
+import Control.Exception
 
 {-# SPECIALIZE snub :: [String] -> [String] #-}
 {-# SPECIALIZE snub :: [Int] -> [Int] #-}
@@ -286,10 +288,10 @@ lefts :: [Either a b] -> [a]
 lefts xs = [x | Left x <- xs]
 
 ioM :: Monad m => IO a -> IO (m a)
-ioM action = catch (fmap return action) (\e -> return (fail (show e)))
+ioM action = catch (fmap return action) (\(e :: SomeException) -> return (fail (show e)))
 
 ioMp :: MonadPlus m => IO a -> IO (m a)
-ioMp action = catch (fmap return action) (\_ -> return mzero)
+ioMp action = catch (fmap return action) (\(_ :: SomeException) -> return mzero)
 
 -- | reformat a string to not be wider than a given width, breaking it up
 -- between words.

pugs-compat/pugs-compat.cabal

@@ -1,5 +1,5 @@
 Name           : pugs-compat
-Version        : 0.0.6.20130209.0
+Version        : 0.0.6.20130209.0.1
 Build-type     : Simple
 Category       : Pugs
 License        : PublicDomain

pugs-compat/src/Pugs/Compat/Posix.hs

@@ -67,6 +67,7 @@ import Foreign.C.Types
 import Foreign.C.String
 import Data.Typeable
 import qualified System.Posix.Signals
+import Control.Exception
 
 _PUGS_HAVE_POSIX :: Bool
 _PUGS_HAVE_POSIX = True
@@ -75,7 +76,8 @@ doesExist :: FilePath -> IO Bool
 doesExist = fileExist
 
 testStatusWith :: (FileStatus -> Bool) -> FilePath -> IO Bool
-testStatusWith t f = fmap t (getFileStatus f) `catch` const (return False)
+testStatusWith t f = fmap t (getFileStatus f) `catch`
+	(const (return False) :: SomeException -> IO Bool)
 
 doesFileExist :: FilePath -> IO Bool
 doesFileExist = testStatusWith isRegularFile