X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Freader%2FReadPrefix.lhs;h=9353e8740fa39bbc2124e284eb6ea390bb72f11d;hb=ae45ff0e9831a0dc862a5d68d03e355d7e323c62;hp=88ddda049db31c693f4722816bb051314b7395ff;hpb=e7498a3ee1d0484d02a9e86633cc179c76ebf36e;p=ghc-hetmet.git

diff --git a/ghc/compiler/reader/ReadPrefix.lhs b/ghc/compiler/reader/ReadPrefix.lhs
index 88ddda0..9353e87 100644
--- a/ghc/compiler/reader/ReadPrefix.lhs
+++ b/ghc/compiler/reader/ReadPrefix.lhs
@@ -17,12 +17,11 @@ import HsPragmas	( noDataPragmas, noClassPragmas, noInstancePragmas )
 import RdrHsSyn
 import PrefixToHs
 
-import CmdLineOpts	( opt_CompilingPrelude )
 import ErrUtils		( addErrLoc, ghcExit )
 import FiniteMap	( elemFM, FiniteMap )
-import Name		( RdrName(..), isRdrLexConOrSpecial )
+import Name		( RdrName(..), isRdrLexConOrSpecial, preludeQual )
 import PprStyle		( PprStyle(..) )
-import PrelMods		( fromPrelude, pRELUDE )
+import PrelMods		( pRELUDE )
 import Pretty
 import SrcLoc		( SrcLoc )
 import Util		( nOfThem, pprError, panic )
@@ -62,12 +61,9 @@ wlkQid	:: U_qid -> UgnM RdrName
 wlkQid (U_noqual name)
   = returnUgn (Unqual name)
 wlkQid (U_aqual  mod name)
-  | fromPrelude mod
-  = returnUgn (Unqual name)
-  | otherwise
   = returnUgn (Qual mod name)
 wlkQid (U_gid n name)
-  = returnUgn (Unqual name)
+  = returnUgn (preludeQual name)
 
 cvFlag :: U_long -> Bool
 cvFlag 0 = False
@@ -307,10 +303,7 @@ wlkExpr expr
 	wlkExpr nexp	`thenUgn` \ expr ->
 	-- this is a hack
 	let
-	    neg = SLIT("negate")
-	    rdr = if opt_CompilingPrelude
-	    	  then Unqual neg
-		  else Qual   pRELUDE neg
+	    rdr = preludeQual SLIT("negate")
 	in
 	returnUgn (NegApp expr (HsVar rdr))
 
@@ -570,12 +563,9 @@ wlkBinding binding
 	    binds     = cvMonoBinds sf bs
 	    uprags    = concat (map cvInstDeclSig ss)
 	    ctxt_inst_ty = HsPreForAllTy ctxt inst_ty
-	    maybe_mod = if opt_CompilingPrelude
-			then Nothing
-		        else Just modname
 	in
 	returnUgn (RdrInstDecl
-          (InstDecl clas ctxt_inst_ty binds True maybe_mod uprags noInstancePragmas src_loc))
+          (InstDecl clas ctxt_inst_ty binds True modname uprags noInstancePragmas src_loc))
 
 	-- "default" declaration
       U_dbind dbindts srcline ->