Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
fe9000d8
Commit
fe9000d8
authored
Oct 11, 2002
by
simonpj
Browse files
[project @ 2002-10-11 08:45:43 by simonpj]
Compatibility fixes for Exception.try
parent
05a9c035
Changes
3
Hide whitespace changes
Inline
Side-by-side
ghc/compiler/HsVersions.h
View file @
fe9000d8
...
...
@@ -14,6 +14,8 @@ you will screw up the layout where they are used in case expressions!
#define CONCURRENT Control.Concurrent
#define EXCEPTION Control.Exception
/* If you want Control.Exception.try, get it as Panic.try, which
deals with the shift from 'tryAllIO' to 'try'. */
#define DYNAMIC Data.Dynamic
#define GLAEXTS GHC.Exts
#define DATA_BITS Data.Bits
...
...
ghc/compiler/typecheck/TcRnTypes.lhs
View file @
fe9000d8
...
...
@@ -74,7 +74,7 @@ import UNSAFE_IO ( unsafeInterleaveIO )
import FIX_IO ( fixIO )
import Maybe ( mapMaybe )
import List ( nub )
import
EXCEPTION as Exception
import
Panic ( Exception, try ) -- Get try from Panic to avoid compiler-version troubles
\end{code}
...
...
@@ -152,13 +152,9 @@ fixM f = TcRn (\ env -> fixIO (\ r -> unTcRn (f r) env))
Error recovery
\begin{code}
tryM :: TcRn m r -> TcRn m (Either Exception
.Exception
r)
tryM :: TcRn m r -> TcRn m (Either Exception r)
-- Reflect exception into TcRn monad
#if __GLASGOW_HASKELL__ <= 408
tryM (TcRn thing) = TcRn (\ env -> Exception.tryAllIO (thing env))
#else
tryM (TcRn thing) = TcRn (\ env -> Exception.try (thing env))
#endif
tryM (TcRn thing) = TcRn (\ env -> try (thing env))
\end{code}
Lazy interleave
...
...
ghc/compiler/utils/Panic.lhs
View file @
fe9000d8
...
...
@@ -13,7 +13,13 @@ module Panic
(
GhcException(..), ghcError, progName,
panic, panic#, assertPanic, trace,
showException, showGhcException, throwDyn, tryMost,
showException, showGhcException, Exception.throwDyn, tryMost,
Exception.Exception,
Panic.try, -- try :: IO a -> IO (Either Exception a)
-- This is Control.Exception.try in the new library story
-- Exception.tryAllIO in GHC 4.08
-- So it usefully hides the difference
#if __GLASGOW_HASKELL__ <= 408
catchJust, ioErrors, throwTo,
...
...
@@ -26,7 +32,7 @@ import Config
import FastTypes
import DYNAMIC
import EXCEPTION as Exception
import
qualified
EXCEPTION as Exception
import TRACE ( trace )
import UNSAFE_IO ( unsafePerformIO )
...
...
@@ -37,7 +43,7 @@ GHC's own exception type.
\begin{code}
ghcError :: GhcException -> a
ghcError e = throwDyn e
ghcError e =
Exception.
throwDyn e
-- error messages all take the form
--
...
...
@@ -64,11 +70,11 @@ progName = unsafePerformIO (getProgName)
short_usage = "Usage: For basic information, try the `--help' option."
showException :: Exception -> String
showException :: Exception
.Exception
-> String
-- Show expected dynamic exceptions specially
showException (DynException d) | Just e <- fromDynamic d
= show (e::GhcException)
showException other_exn = show other_exn
showException (
Exception.
DynException d) | Just e <- fromDynamic d
= show (e::GhcException)
showException other_exn
= show other_exn
instance Show GhcException where
showsPrec _ e@(ProgramError _) = showGhcException e
...
...
@@ -111,7 +117,7 @@ Panics and asserts.
\begin{code}
panic :: String -> a
panic x = throwDyn (Panic x)
panic x =
Exception.
throwDyn (Panic x)
-- #-versions because panic can't return an unboxed int, and that's
-- what TAG_ is with GHC at the moment. Ugh. (Simon)
...
...
@@ -122,7 +128,7 @@ panic# s = case (panic s) of () -> _ILIT 0
assertPanic :: String -> Int -> a
assertPanic file line =
throw (
AssertionFailed
Exception.throw (Exception.
AssertionFailed
("ASSERT failed! file " ++ file ++ ", line " ++ show line))
\end{code}
...
...
@@ -131,22 +137,22 @@ assertPanic file line =
-- exceptions. Used when we want soft failures when reading interface
-- files, for example.
tryMost :: IO a -> IO (Either Exception a)
tryMost action = do r <-
myT
ry action; filter r
tryMost :: IO a -> IO (Either Exception
.Exception
a)
tryMost action = do r <-
t
ry action; filter r
where
filter (Left e@(DynException d))
filter (Left e@(
Exception.
DynException d))
| Just ghc_ex <- fromDynamic d
= case ghc_ex of
Interrupted -> throw e
Panic _ -> throw e
Interrupted ->
Exception.
throw e
Panic _ ->
Exception.
throw e
_other -> return (Left e)
filter other
= return other
#if __GLASGOW_HASKELL__ <= 408
myT
ry = tryAllIO
t
ry =
Exception.
tryAllIO
#else
myT
ry = Exception.try
t
ry = Exception.try
#endif
\end{code}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment