X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnMonad.lhs;fp=ghc%2Fcompiler%2Frename%2FRnMonad.lhs;h=6fdcd334735df976060632963598753b88bb3295;hb=ef2b170c6298b4826d3b56465a3c1438b5be7307;hp=966e1bcbc00191b2d0090ec431fcc2f31ca6eec8;hpb=4c5db78e8613611919c083d7fd96e69c728b0131;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs index 966e1bc..6fdcd33 100644 --- a/ghc/compiler/rename/RnMonad.lhs +++ b/ghc/compiler/rename/RnMonad.lhs @@ -182,12 +182,7 @@ isCmdLineMode CmdLineMode = True isCmdLineMode _ = False \end{code} -%=================================================== -\subsubsection{ ENVIRONMENTS} -%=================================================== - \begin{code} --------------------------------- type LocalFixityEnv = NameEnv RenamedFixitySig -- We keep the whole fixity sig so that we -- can report line-number info when there is a duplicate @@ -195,14 +190,9 @@ type LocalFixityEnv = NameEnv RenamedFixitySig emptyLocalFixityEnv :: LocalFixityEnv emptyLocalFixityEnv = emptyNameEnv - -lookupLocalFixity :: LocalFixityEnv -> Name -> Fixity -lookupLocalFixity env name - = case lookupNameEnv env name of - Just (FixitySig _ fix _) -> fix - Nothing -> defaultFixity \end{code} + %************************************************************************ %* * \subsection{Interface file stuff} @@ -731,13 +721,9 @@ getFixityEnv :: RnMS LocalFixityEnv getFixityEnv rn_down (SDown {rn_fixenv = fixity_env}) = return fixity_env -extendFixityEnv :: [(Name, RenamedFixitySig)] -> RnMS a -> RnMS a -extendFixityEnv fixes enclosed_scope - rn_down l_down@(SDown {rn_fixenv = fixity_env}) - = let - new_fixity_env = extendNameEnvList fixity_env fixes - in - enclosed_scope rn_down (l_down {rn_fixenv = new_fixity_env}) +setFixityEnv :: LocalFixityEnv -> RnMS a -> RnMS a +setFixityEnv fixes enclosed_scope rn_down l_down + = enclosed_scope rn_down (l_down {rn_fixenv = fixes}) \end{code} %================