[project @ 2002-04-05 23:24:25 by sof]

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

diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index 133b19d..1eefbc3 100644 (file)
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -25,7 +25,7 @@ import RnEnv
 import RnMonad
 
 import FiniteMap
-import PrelNames       ( pRELUDE_Name, mAIN_Name, main_RDR_Unqual, isUnboundName )
+import PrelNames       ( pRELUDE_Name, mAIN_Name, isUnboundName )
 import Module          ( ModuleName, moduleName, WhereFrom(..) )
 import Name            ( Name, nameSrcLoc, nameOccName )
 import NameSet
@@ -38,9 +38,9 @@ import RdrName                ( rdrNameOcc, setRdrNameOcc )
 import OccName         ( setOccNameSpace, dataName )
 import NameSet         ( elemNameSet, emptyNameSet )
 import Outputable
-import Maybes          ( maybeToBool, catMaybes, mapMaybe )
+import Maybes          ( maybeToBool, catMaybes )
 import ListSetOps      ( removeDups )
-import Util            ( sortLt )
+import Util            ( sortLt, notNull )
 import List            ( partition )
 \end{code}
 
@@ -113,7 +113,7 @@ getGlobalNames this_mod (HsModule _ _ _ imports decls _ mod_loc)
                                  mod_loc]
     
     explicit_prelude_import
-      = not (null [ () | (ImportDecl mod _ _ _ _ _) <- imports, mod == pRELUDE_Name ])
+      = notNull [ () | (ImportDecl mod _ _ _ _ _) <- imports, mod == pRELUDE_Name ]
 \end{code}
        
 \begin{code}
@@ -449,13 +449,14 @@ exportsFromAvail :: ModuleName
        -- Complains about exports items not in scope
 exportsFromAvail this_mod Nothing 
                 mod_avail_env entity_avail_env global_name_env
-  = exportsFromAvail this_mod true_exports mod_avail_env entity_avail_env global_name_env
+  = exportsFromAvail this_mod (Just true_exports) mod_avail_env 
+                    entity_avail_env global_name_env
   where
-    true_exports = Just $ if this_mod == mAIN_Name
-                          then [IEVar main_RDR_Unqual]
-                               -- export Main.main *only* unless otherwise specified,
-                          else [IEModuleContents this_mod]
-                               -- but for all other modules export everything.
+    true_exports 
+      | this_mod == mAIN_Name = []
+              -- Export nothing; Main.$main is automatically exported
+      | otherwise            = [IEModuleContents this_mod]
+              -- but for all other modules export everything.
 
 exportsFromAvail this_mod (Just export_items) 
                 mod_avail_env entity_avail_env global_name_env