X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnBinds.lhs;h=1d17c7b4cc85329819ce38598cf698b4be37b3f8;hb=32f35c6fba6a8a2076c79e775644dbc76778c3a1;hp=7c7046e6d1d8d2940738adec4be190071b576285;hpb=a27c5f77da8b3b3f00f9902b69a504460f234e8c;p=ghc-hetmet.git

diff --git a/compiler/rename/RnBinds.lhs b/compiler/rename/RnBinds.lhs
index 7c7046e..1d17c7b 100644
--- a/compiler/rename/RnBinds.lhs
+++ b/compiler/rename/RnBinds.lhs
@@ -23,8 +23,6 @@ module RnBinds (rnTopBinds, rnTopBindsLHS, rnTopBindsRHS, -- use these for top-l
                 makeMiniFixityEnv, MiniFixityEnv
    ) where
 
-#include "HsVersions.h"
-
 import {-# SOURCE #-} RnExpr( rnLExpr, rnStmts )
 
 import HsSyn
@@ -190,7 +188,7 @@ rnTopBindsRHS bound_names binds =
 rnTopBinds :: HsValBinds RdrName 
            -> RnM (HsValBinds Name, DefUses)
 rnTopBinds b = 
-  do nl <- rnTopBindsLHS emptyOccEnv b
+  do nl <- rnTopBindsLHS emptyFsEnv b
      let bound_names = map unLoc (collectHsValBinders nl)
      bindLocalNames bound_names  $ rnTopBindsRHS bound_names nl
        
@@ -321,7 +319,7 @@ rnValBindsRHSGen :: (FreeVars -> FreeVars)  -- for trimming free var sets
 rnValBindsRHSGen trim bound_names binds@(ValBindsIn mbinds sigs) = do
    -- rename the sigs
    env <- getGblEnv
-   traceRn (ptext SLIT("Rename sigs") <+> ppr (tcg_rdr_env env))
+   traceRn (ptext (sLit "Rename sigs") <+> ppr (tcg_rdr_env env))
    sigs' <- rename_sigs sigs
    -- rename the RHSes
    binds_w_dus <- mapBagM (rnBind (mkSigTvFn sigs') trim) mbinds
@@ -413,18 +411,18 @@ rnValBindsAndThen binds@(ValBindsIn _ sigs) thing_inside
 
 makeMiniFixityEnv :: [LFixitySig RdrName] -> RnM MiniFixityEnv
 
-makeMiniFixityEnv decls = foldlM add_one emptyOccEnv decls
+makeMiniFixityEnv decls = foldlM add_one emptyFsEnv decls
  where
    add_one env (L loc (FixitySig (L name_loc name) fixity)) = do
      { -- this fixity decl is a duplicate iff
        -- the ReaderName's OccName's FastString is already in the env
        -- (we only need to check the local fix_env because
        --  definitions of non-local will be caught elsewhere)
-       let {occ = rdrNameOcc name;
-            fix_item = L loc fixity};
+       let { fs = occNameFS (rdrNameOcc name)
+           ; fix_item = L loc fixity };
 
-       case lookupOccEnv env occ of
-         Nothing -> return $ extendOccEnv env occ fix_item
+       case lookupFsEnv env fs of
+         Nothing -> return $ extendFsEnv env fs fix_item
          Just (L loc' _) -> do
            { setSrcSpan loc $ 
              addLocErr (L name_loc name) (dupFixityDecl loc')
@@ -437,8 +435,8 @@ pprFixEnv env
 		  (nameEnvElts env)
 
 dupFixityDecl loc rdr_name
-  = vcat [ptext SLIT("Multiple fixity declarations for") <+> quotes (ppr rdr_name),
-	  ptext SLIT("also at ") <+> ppr loc]
+  = vcat [ptext (sLit "Multiple fixity declarations for") <+> quotes (ppr rdr_name),
+	  ptext (sLit "also at ") <+> ppr loc]
 
 ---------------------
 
@@ -832,7 +830,7 @@ rnGRHS' ctxt (GRHS guards rhs)
 \begin{code}
 dupSigDeclErr sigs@(L loc sig : _)
   = addErrAt loc $
-	vcat [ptext SLIT("Duplicate") <+> what_it_is <> colon,
+	vcat [ptext (sLit "Duplicate") <+> what_it_is <> colon,
 	      nest 2 (vcat (map ppr_sig sigs))]
   where
     what_it_is = hsSigDoc sig
@@ -841,28 +839,28 @@ dupSigDeclErr sigs@(L loc sig : _)
 unknownSigErr (L loc sig)
   = do	{ mod <- getModule
 	; addErrAt loc $
-		vcat [sep [ptext SLIT("Misplaced") <+> what_it_is <> colon, ppr sig],
+		vcat [sep [ptext (sLit "Misplaced") <+> what_it_is <> colon, ppr sig],
 		      extra_stuff mod sig] }
   where
     what_it_is = hsSigDoc sig
     extra_stuff mod  (TypeSig (L _ n) _)
 	| nameIsLocalOrFrom mod n
-	= ptext SLIT("The type signature must be given where")
-		<+> quotes (ppr n) <+> ptext SLIT("is declared")
+	= ptext (sLit "The type signature must be given where")
+		<+> quotes (ppr n) <+> ptext (sLit "is declared")
 	| otherwise
-	= ptext SLIT("You cannot give a type signature for an imported value")
+	= ptext (sLit "You cannot give a type signature for an imported value")
 
     extra_stuff mod other = empty
 
 methodBindErr mbind
- =  hang (ptext SLIT("Pattern bindings (except simple variables) not allowed in instance declarations"))
+ =  hang (ptext (sLit "Pattern bindings (except simple variables) not allowed in instance declarations"))
        2 (ppr mbind)
 
 bindsInHsBootFile mbinds
-  = hang (ptext SLIT("Bindings in hs-boot files are not allowed"))
+  = hang (ptext (sLit "Bindings in hs-boot files are not allowed"))
        2 (ppr mbinds)
 
 nonStdGuardErr guards
-  = hang (ptext SLIT("accepting non-standard pattern guards (use -XPatternGuards to suppress this message)"))
+  = hang (ptext (sLit "accepting non-standard pattern guards (use -XPatternGuards to suppress this message)"))
        4 (interpp'SP guards)
 \end{code}