projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-09-25 11:55:07 by simonpj]
[ghc-hetmet.git]
/
ghc
/
compiler
/
rename
/
RnHiFiles.lhs
diff --git
a/ghc/compiler/rename/RnHiFiles.lhs
b/ghc/compiler/rename/RnHiFiles.lhs
index
931c5cf
..
25706e3
100644
(file)
--- a/
ghc/compiler/rename/RnHiFiles.lhs
+++ b/
ghc/compiler/rename/RnHiFiles.lhs
@@
-39,7
+39,7
@@
import RnEnv
import TcRnMonad
import PrelNames ( gHC_PRIM_Name, gHC_PRIM )
import TcRnMonad
import PrelNames ( gHC_PRIM_Name, gHC_PRIM )
-import PrelInfo ( ghcPrimExports, cCallableClassDecl, cReturnableClassDecl, assertDecl )
+import PrelInfo ( ghcPrimExports, cCallableClassDecl, cReturnableClassDecl )
import Name ( Name {-instance NamedThing-},
nameModule, isInternalName )
import NameEnv
import Name ( Name {-instance NamedThing-},
nameModule, isInternalName )
import NameEnv
@@
-688,12
+688,12
@@
findHiFile mod_name hi_boot_file
@readIface@ tries just the one file.
\begin{code}
@readIface@ tries just the one file.
\begin{code}
-readIface :: Module -> String -> IsBootInterface -> TcRn m (Either IOError ParsedIface)
+readIface :: Module -> String -> IsBootInterface -> TcRn m (Either Exception ParsedIface)
-- Nothing <=> file not found, or unreadable, or illegible
-- Just x <=> successfully found and parsed
readIface mod file_path is_hi_boot_file
-- Nothing <=> file not found, or unreadable, or illegible
-- Just x <=> successfully found and parsed
readIface mod file_path is_hi_boot_file
- = ioToTcRn_no_fail (read_iface mod file_path is_hi_boot_file)
+ = ioToTcRn (tryMost (read_iface mod file_path is_hi_boot_file))
read_iface mod file_path is_hi_boot_file
| is_hi_boot_file -- Read ascii
read_iface mod file_path is_hi_boot_file
| is_hi_boot_file -- Read ascii
@@
-740,8
+740,7
@@
ghcPrimIface = ParsedIface {
pi_usages = [],
pi_exports = (1, [(gHC_PRIM_Name, ghcPrimExports)]),
pi_decls = [(1,cCallableClassDecl),
pi_usages = [],
pi_exports = (1, [(gHC_PRIM_Name, ghcPrimExports)]),
pi_decls = [(1,cCallableClassDecl),
- (1,cReturnableClassDecl),
- (1,assertDecl)],
+ (1,cReturnableClassDecl)],
pi_fixity = [FixitySig (nameRdrName (idName seqId))
(Fixity 0 InfixR) noSrcLoc],
-- seq is infixr 0
pi_fixity = [FixitySig (nameRdrName (idName seqId))
(Fixity 0 InfixR) noSrcLoc],
-- seq is infixr 0