projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-01-23 18:06:01 by panne]
[ghc-base.git]
/
System
/
IO
/
Error.hs
diff --git
a/System/IO/Error.hs
b/System/IO/Error.hs
index
cff0194
..
a5296cc
100644
(file)
--- a/
System/IO/Error.hs
+++ b/
System/IO/Error.hs
@@
-28,8
+28,8
@@
module System.IO.Error (
mkIOError, -- :: IOErrorType -> String -> Maybe Handle
-- -> Maybe FilePath -> IOError
mkIOError, -- :: IOErrorType -> String -> Maybe Handle
-- -> Maybe FilePath -> IOError
- annotateIOError, -- :: IOError -> String -> Maybe FilePath
- -- -> Maybe Handle -> IOError
+ annotateIOError, -- :: IOError -> String -> Maybe Handle
+ -- -> Maybe FilePath -> IOError
#endif
alreadyExistsErrorType, -- :: IOErrorType
#endif
alreadyExistsErrorType, -- :: IOErrorType
@@
-240,10
+240,10
@@
ioeGetFileName ioe = ioe_filename ioe
annotateIOError :: IOError
-> String
annotateIOError :: IOError
-> String
- -> Maybe FilePath
-> Maybe Handle
-> Maybe Handle
+ -> Maybe FilePath
-> IOError
-> IOError
-annotateIOError (IOError hdl errTy _ str path) loc opath ohdl =
+annotateIOError (IOError ohdl errTy _ str opath) loc hdl path =
IOError (hdl `mplus` ohdl) errTy loc str (path `mplus` opath)
where
Nothing `mplus` ys = ys
IOError (hdl `mplus` ohdl) errTy loc str (path `mplus` opath)
where
Nothing `mplus` ys = ys