[project @ 1998-01-29 12:46:11 by simonpj]

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

diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index 0574301..f8cf4b1 100644 (file)
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -313,7 +313,7 @@ qualifyImports this_mod qual_imp unqual_imp as_mod hides
        fixity_env = foldl (add_fixity name_env2) emptyFixityEnv fixities
 
        -- Create the export-availability info
-       export_avails = mkExportAvails unqual_imp qual_mod avails
+       export_avails = mkExportAvails qual_mod unqual_imp name_env2 avails
     in
     returnRn (RnEnv name_env2 fixity_env, export_avails)
   where
@@ -323,6 +323,7 @@ qualifyImports this_mod qual_imp unqual_imp as_mod hides
 
     add_avail :: GlobalNameEnv -> AvailInfo -> RnMG GlobalNameEnv
     add_avail env avail = foldlRn add_name env (availNames avail)
+
     add_name env name   = add qual_imp   env  (Qual qual_mod occ err_hif) `thenRn` \ env1 ->
                          add unqual_imp env1 (Unqual occ)
                        where
@@ -398,8 +399,8 @@ addAvailEnv warn_dups ie env NotAvailable   = returnRn env
 addAvailEnv warn_dups ie env (AvailTC _ []) = returnRn env
 addAvailEnv warn_dups ie env avail
   | warn_dups = mapMaybeRn (addErrRn  . availClashErr) () conflict `thenRn_`
-                returnRn (addToFM_C add_avail env key elt)
-  | otherwise = returnRn (addToFM_C add_avail env key elt)
+                returnRn (addToFM_C addAvail env key elt)
+  | otherwise = returnRn (addToFM_C addAvail env key elt)
   where
    key  = nameOccName (availName avail)
    elt  = (ie,avail,reports_on)
@@ -421,7 +422,7 @@ bad_avail  (ie1,avail1,r1) (ie2,avail2,r2)
 dup_avail  (ie1,avail1,r1) (ie2,avail2,r2) 
    = availName avail1 == availName avail2 -- Same OccName & avail.
 
-add_avail (ie1,a1,r1) (ie2,a2,r2) = (ie1, a1 `plusAvail` a2, r1 + r2)
+addAvail (ie1,a1,r1) (ie2,a2,r2) = (ie1, a1 `plusAvail` a2, r1 + r2)
 \end{code}
 
 Processing the export list.