X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=28cd29aeaf93e8216a97076b0b4686714a6c0965;hb=5eb1c77c795f92ed0f4c8023847e9d4be1a4fd0d;hp=759848942437a4c5016820f91c5ab16ba11513b8;hpb=573ef10b2afd99d3c6a36370a9367609716c97d2;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index 7598489..28cd29a 100644
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -31,7 +31,7 @@ import Bag		( emptyBag, unitBag, consBag, snocBag, unionBags,
 			  unionManyBags, mapBag, foldBag, filterBag, listToBag, bagToList )
 import CmdLineOpts	( opt_NoImplicitPrelude, opt_CompilingGhcInternals )
 import ErrUtils		( SYN_IE(Error), SYN_IE(Warning), addErrLoc, addShortErrLocLine, addShortWarnLocLine )
-import FiniteMap	( emptyFM, addToFM, addListToFM, lookupFM, fmToList, eltsFM, delListFromFM, keysFM{-ToDo:rm-}, FiniteMap )
+import FiniteMap	( emptyFM, addToFM, addListToFM, lookupFM, fmToList, eltsFM, delListFromFM, FiniteMap )
 import Id		( GenId )
 import Maybes		( maybeToBool, catMaybes, MaybeErr(..) )
 import Name		( RdrName(..), Name, isQual, mkTopLevName, mkWiredInName, origName,
@@ -49,9 +49,9 @@ import TyCon		( tyConDataCons )
 import UniqFM		( emptyUFM, addListToUFM_C, lookupUFM )
 import UniqSupply	( splitUniqSupply )
 import Util		( isIn, assoc, cmpPString, sortLt, removeDups,
-			  equivClasses, panic, assertPanic, pprPanic{-ToDo:rm-}, pprTrace{-ToDo:rm-}
+			  equivClasses, panic, assertPanic
 			)
-import PprStyle --ToDo:rm 
+--import PprStyle --ToDo:rm 
 \end{code}
 
 \begin{code}
@@ -121,7 +121,7 @@ getGlobalNames iface_cache info us
 *********************************************************
 
 \begin{code}
-getSourceNames ::
+getSourceNames ::			-- Collects global *binders* (not uses)
 	   [RdrNameTyDecl]
 	-> [RdrNameClassDecl]
 	-> RdrNameHsBinds
@@ -332,7 +332,7 @@ newGlobalName locn maybe_exp is_val_name rdr@(Qual mod name)
 	  = case (lookupFM b_keys orig) of
 	      Just (key,_) -> (key, True)
 	      Nothing	   -> case (lookupFM (if is_val_name then b_val_names else b_tc_names) orig) of
-			        Nothing -> (pprPanic "newGlobalName:Qual:uniq:" (ppr PprDebug rdr), True)
+			        Nothing -> (panic "newGlobalName:Qual:uniq", True)
 				Just xx -> (uniqueOf xx, False{-builtin!-})
 
 	exp = case maybe_exp of
@@ -347,7 +347,7 @@ newGlobalName locn maybe_exp is_val_name rdr@(Qual mod name)
 
   | otherwise
   = addErrRn (qualNameErr "name in definition" (rdr, locn)) `thenRn_`
-    returnRn (pprPanic "newGlobalName:Qual:" (ppr PprDebug rdr))
+    returnRn (panic "newGlobalName:Qual")
 \end{code}
 
 *********************************************************
@@ -389,7 +389,10 @@ doImportDecls iface_cache g_info us src_imps
 
     	    rec_imp_fn :: Name -> (ExportFlag, [SrcLoc])
 	    rec_imp_fn n = case lookupUFM rec_imp_fm n of
-		             Nothing            -> panic "RnNames:rec_imp_fn"
+		             Nothing            -> (NotExported,[mkBuiltinSrcLoc])
+						   -- panic "RnNames:rec_imp_fn"
+						   -- but the panic can show up
+						   -- in error messages
 		             Just (flag, locns) -> (flag, bagToList locns)
 
 	    i_info = (g_info, emptyFM, emptyFM, rec_imp_fn)
@@ -624,7 +627,7 @@ getBuiltins (((b_val_names,b_tc_names),_,_,_),_,_,_) modname maybe_spec
 	    (str, orig)
 	      = case (ie_name ie) of
 		  Unqual s -> (s, OrigName modname s)
-		  Qual m s -> pprTrace "do_builtin:surprising qual!" (ppCat [ppPStr m, ppPStr s]) $
+		  Qual m s -> --pprTrace "do_builtin:surprising qual!" (ppCat [ppPStr m, ppPStr s]) $
 			      (s, OrigName modname s)
 	in
 	case (lookupFM b_tc_names orig) of 	-- NB: we favour the tycon/class FM...