[project @ 2002-05-27 15:28:07 by simonpj]

[ghc-hetmet.git] / ghc / compiler / rename / RnBinds.lhs

diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs
index bb6f9ea..af0f982 100644 (file)
--- a/ghc/compiler/rename/RnBinds.lhs
+++ b/ghc/compiler/rename/RnBinds.lhs
@@ -27,7 +27,7 @@ import RnMonad
 import RnTypes         ( rnHsSigType, rnHsType )
 import RnExpr          ( rnMatch, rnGRHSs, rnPat, checkPrecMatch )
 import RnEnv           ( bindLocatedLocalsRn, lookupBndrRn, lookupInstDeclBndr,
-                         lookupSigOccRn, bindPatSigTyVars,
+                         lookupSigOccRn, bindPatSigTyVars, extendNestedFixityEnv,
                          warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn,
                        )
 import CmdLineOpts     ( DynFlag(..) )
@@ -233,7 +233,7 @@ rnMonoBinds mbinds sigs     thing_inside -- Non-empty monobinds
     let
        fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- siglist ]
     in
-    extendFixityEnv fixity_sigs $
+    extendNestedFixityEnv fixity_sigs $
 
     rn_mono_binds siglist mbinds          `thenRn` \ (binds, bind_fvs) ->
 
@@ -556,14 +556,14 @@ renameSig (InlineSig b v p src_loc)
 \begin{code}
 dupSigDeclErr sig
   = pushSrcLocRn loc $
-    addErrRn (sep [ptext SLIT("Duplicate") <+> ptext what_it_is <> colon,
+    addErrRn (sep [ptext SLIT("Duplicate") <+> what_it_is <> colon,
                   ppr sig])
   where
     (what_it_is, loc) = hsSigDoc sig
 
 unknownSigErr sig
   = pushSrcLocRn loc $
-    addErrRn (sep [ptext SLIT("Misplaced") <+> ptext what_it_is <> colon,
+    addErrRn (sep [ptext SLIT("Misplaced") <+> what_it_is <> colon,
                   ppr sig])
   where
     (what_it_is, loc) = hsSigDoc sig