Changeset 22989 for src

Timestamp:

11/12/08 10:00:43 (8 weeks ago)

Author:

audreyt

Message:

* GHC 6.10 support, part 2 of 3: Adjust for extensible exceptions.

Location:

src/Pugs

Files:

• AST/Eval.hs (modified) (2 diffs)
• Prim.hs (modified) (3 diffs)

src/Pugs/AST/Eval.hs

@@ -4 +4 @@
 import Pugs.Internals
 import Pugs.Cont hiding (resetT)
-import Control.Exception (try, Exception)
+import System.IO.Error (try, IOError)
 
 import Pugs.AST.SIO
@@ -165 +165 @@
 supress the exception and return an associated value instead.
 -}
-guardIOexcept :: MonadIO m => [((Exception -> Bool), a)] -> IO a -> m a
+guardIOexcept :: MonadIO m => [((IOError -> Bool), a)] -> IO a -> m a
 guardIOexcept safetyNet x = do
     rv <- io $ try x

src/Pugs/Prim.hs

@@ -39 +39 @@
 import Data.IORef
 import System.IO.Error (isEOFError)
-import Control.Exception (ioErrors)
 
 import Pugs.Prim.Keyed
@@ -217 +216 @@
 op1 "~^"   = op1Cast (VStr . mapStr complement)
 op1 "?^"   = op1 "!"
-op1 "\\"   = \v -> do
-    return $ case v of
-        (VRef (MkRef (IScalar _))) -> VRef . scalarRef $ v
-        (VRef _)    -> v
-        (VList vs)  -> VRef . arrayRef $ vs
-        _           -> VRef . scalarRef $ v
+op1 "\\"   = return . doCapture
+    where
+    doCapture :: Val -> Val
+    doCapture v@(VRef (MkRef IScalar{})) = VRef . scalarRef $ v
+    doCapture v@VRef{}                   = v
+    doCapture (VList vs)                 = VRef . arrayRef $ vs
+    doCapture v                          = VRef . scalarRef $ v
 op1 "^" = op2RangeExclRight (VNum 0)
 op1 "post:..."  = op1Range
@@ -843 +843 @@
             _           -> return undef
     doGetLine :: VHandle -> IO (Maybe VStr)
-    doGetLine fh = guardIOexcept [(isIOError isEOFError, Nothing)] $ do
+    doGetLine fh = guardIOexcept [(isEOFError, Nothing)] $ do
         line <- hGetLine fh
         return . Just . decodeUTF8 $ line
 
-isIOError :: (IOError -> Bool) -> Exception -> Bool
-isIOError f err = case ioErrors err of
-    Just ioe    -> f ioe
-    Nothing     -> False
-
 op1Getc :: Val -> Eval Val
 op1Getc = \v -> op1Read v (getChar) (getChar)
     where
     getChar :: VHandle -> Eval Val
-    getChar fh = guardIOexcept [(isIOError isEOFError, undef)] $ do
+    getChar fh = guardIOexcept [(isEOFError, undef)] $ do
         char <- hGetChar fh
         str  <- getChar' fh char