X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnIfaces.lhs;h=eebe37e956c1adb1138fe0a971ade90d49752ae2;hb=90c0b29e6d8d847e5357bd0a9df98e2846046db7;hp=dfd74faf4453ae37ebf666fbf861f74eaaac26dd;hpb=e7b901ded4857432d181386ac1ec51acb6ad2be7;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnIfaces.lhs b/ghc/compiler/rename/RnIfaces.lhs
index dfd74fa..eebe37e 100644
--- a/ghc/compiler/rename/RnIfaces.lhs
+++ b/ghc/compiler/rename/RnIfaces.lhs
@@ -25,7 +25,7 @@ import CmdLineOpts	( opt_PruneTyDecls,  opt_PruneInstDecls,
 import HsSyn		( HsDecl(..), TyClDecl(..), InstDecl(..), IfaceSig(..), 
 			  HsType(..), ConDecl(..), IE(..), ConDetails(..), Sig(..),
 			  FixitySig(..),
-			  hsDeclName, countTyClDecls, isDataDecl, nonFixitySigs
+			  hsDeclName, countTyClDecls, isDataDecl, isClassOpSig
 			)
 import BasicTypes	( Version, NewOrData(..) )
 import RdrHsSyn		( RdrNameHsDecl, RdrNameInstDecl, RdrNameTyClDecl,
@@ -765,7 +765,7 @@ getImportedInstDecls :: RnMG [(Module,RdrNameInstDecl)]
 getImportedInstDecls
   = 	-- First load any special-instance modules that aren't aready loaded
     getSpecialInstModules 			`thenRn` \ inst_mods ->
-    mapRn load_it inst_mods			`thenRn_`
+    mapRn_ load_it inst_mods			`thenRn_`
 
 	-- Now we're ready to grab the instance declarations
 	-- Find the un-gated ones and return them, 
@@ -820,7 +820,7 @@ getImportedFixities gbl_env
 					   not (isLocallyDefined name)
 		       ]
     in
-    mapRn load (nub home_modules)	`thenRn_`
+    mapRn_ load (nub home_modules)	`thenRn_`
 
 	-- Now we can snaffle the fixity env
     getIfacesRn						`thenRn` \ ifaces ->
@@ -996,10 +996,10 @@ getDeclBinders new_name (TyClD (ClassDecl _ cname _ sigs _ _ tname dname src_loc
 
 	-- Record the names for the class ops
     let
-	-- ignoring fixity declarations
-	nonfix_sigs = nonFixitySigs sigs
+	-- just want class-op sigs
+	op_sigs = filter isClassOpSig sigs
     in
-    mapRn (getClassOpNames new_name) nonfix_sigs	`thenRn` \ sub_names ->
+    mapRn (getClassOpNames new_name) op_sigs	`thenRn` \ sub_names ->
 
     returnRn (Just (AvailTC class_name (class_name : sub_names)))