X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Futils%2FPanic.lhs;h=0e049b0cfbf1b7fc8a6d38fa3ab7aa7d1e58d0ea;hp=6f7a4a801876deb81c487935a7ed95ae3ff95436;hb=ec197dfef33654dd16b5832905dad2e52f79f7ab;hpb=cd85694dcc3fd0cccbba84421185b41ae7fd762a diff --git a/compiler/utils/Panic.lhs b/compiler/utils/Panic.lhs index 6f7a4a8..0e049b0 100644 --- a/compiler/utils/Panic.lhs +++ b/compiler/utils/Panic.lhs @@ -219,22 +219,16 @@ tryUser action = tryJust tc_errors action tc_errors e@(Exception.IOException ioe) | isUserError ioe = Just e tc_errors _other = Nothing #else -tryUser :: IO a -> IO (Either ErrorCall a) +tryUser :: IO a -> IO (Either IOException a) tryUser io = do ei <- try io case ei of Right v -> return (Right v) Left se@(SomeException ex) -> - case cast ex of - -- Look for good old fashioned ErrorCall's - Just errorCall -> return (Left errorCall) - Nothing -> - case cast ex of - -- And also for user errors in IO errors. - -- Sigh. + case cast ex of Just ioe | isUserError ioe -> - return (Left (ErrorCall (ioeGetErrorString ioe))) + return (Left ioe) _ -> throw se #endif \end{code}