[project @ 2004-10-20 13:34:04 by simonpj]

[ghc-hetmet.git] / ghc / compiler / deSugar / Desugar.lhs

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 84b7216..1a5d7e8 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -10,8 +10,7 @@ module Desugar ( deSugar, deSugarExpr ) where
 
 import CmdLineOpts     ( DynFlag(..), dopt, opt_SccProfilingOn )
 import HscTypes                ( ModGuts(..), ModGuts, HscEnv(..), GhciMode(..),
-                         Dependencies(..), TypeEnv, 
-                         unQualInScope, availsToNameSet )
+                         Dependencies(..), TypeEnv, IsBootInterface, unQualInScope )
 import HsSyn           ( RuleDecl(..), RuleBndr(..), HsExpr(..), LHsExpr,
                          HsBindGroup(..), LRuleDecl, HsBind(..) )
 import TcRnTypes       ( TcGblEnv(..), ImportAvails(..) )
@@ -20,14 +19,14 @@ import Id           ( Id, setIdLocalExported, idName )
 import Name            ( Name, isExternalName )
 import CoreSyn
 import PprCore         ( pprIdRules, pprCoreExpr )
-import Subst           ( substExpr, mkSubst, mkInScopeSet )
+import Subst           ( SubstResult(..), substExpr, mkSubst, extendIdSubstList )
 import DsMonad
 import DsExpr          ( dsLExpr )
 import DsBinds         ( dsHsBinds, AutoScc(..) )
 import DsForeign       ( dsForeigns )
 import DsExpr          ()      -- Forces DsExpr to be compiled; DsBinds only
                                -- depends on DsExpr.hi-boot.
-import Module          ( Module, moduleEnvElts, emptyModuleEnv )
+import Module          ( Module, ModuleName, moduleEnvElts, delModuleEnv, moduleNameFS )
 import Id              ( Id )
 import RdrName         ( GlobalRdrEnv )
 import NameSet
@@ -45,7 +44,7 @@ import UniqSupply     ( mkSplitUniqSupply )
 import SrcLoc          ( Located(..), SrcSpan, unLoc )
 import DATA_IOREF      ( readIORef )
 import FastString
-import Data.List       ( sort )
+import Util            ( sortLe )
 \end{code}
 
 %************************************************************************
@@ -93,17 +92,34 @@ deSugar hsc_env
                  (printDump (ppr_ds_rules ds_rules))
 
        ; dfun_uses <- readIORef dfun_uses_var          -- What dfuns are used
+       ; th_used   <- readIORef th_var
        ; let used_names = allUses dus `unionNameSets` dfun_uses
-       ; usages <- mkUsageInfo hsc_env imports used_names
+             pkgs | th_used   = insertList thPackage (imp_dep_pkgs imports)
+                  | otherwise = imp_dep_pkgs imports
 
-       ; th_used <- readIORef th_var
-       ; let 
-            pkgs | th_used   = insertList thPackage (imp_dep_pkgs imports)
-                 | otherwise = imp_dep_pkgs imports
+             dep_mods = moduleEnvElts (delModuleEnv (imp_dep_mods imports) mod)
+               -- M.hi-boot can be in the imp_dep_mods, but we must remove
+               -- it before recording the modules on which this one depends!
+               -- (We want to retain M.hi-boot in imp_dep_mods so that 
+               --  loadHiBootInterface can see if M's direct imports depend 
+               --  on M.hi-boot, and hence that we should do the hi-boot consistency 
+               --  check.)
+
+             dir_imp_mods = imp_mods imports
+
+       ; usages <- mkUsageInfo hsc_env dir_imp_mods dep_mods used_names
 
-            deps = Deps { dep_mods = moduleEnvElts (imp_dep_mods imports), 
-                          dep_pkgs  = sort pkgs,       
-                          dep_orphs = sort (imp_orphs imports) }
+       ; let 
+               -- ModuleNames don't compare lexicographically usually, 
+               -- but we want them to do so here.
+            le_mod :: ModuleName -> ModuleName -> Bool  
+            le_mod m1 m2 = moduleNameFS m1 <= moduleNameFS m2
+            le_dep_mod :: (ModuleName, IsBootInterface) -> (ModuleName, IsBootInterface) -> Bool        
+            le_dep_mod (m1,_) (m2,_) = m1 `le_mod` m2
+
+            deps = Deps { dep_mods  = sortLe le_dep_mod dep_mods,
+                          dep_pkgs  = sortLe (<=)   pkgs,      
+                          dep_orphs = sortLe le_mod (imp_orphs imports) }
                -- sort to get into canonical order
 
             mod_guts = ModGuts {       
@@ -111,7 +127,7 @@ deSugar hsc_env
                mg_exports  = exports,
                mg_deps     = deps,
                mg_usages   = usages,
-               mg_dir_imps = [m | (m,_,_) <- moduleEnvElts (imp_mods imports)],
+               mg_dir_imps = [m | (m,_,_) <- moduleEnvElts dir_imp_mods],
                mg_rdr_env  = rdr_env,
                mg_fix_env  = fix_env,
                mg_deprecs  = deprecs,
@@ -277,12 +293,10 @@ ds_lhs all_vars lhs
        -- Substitute the dict bindings eagerly,
        -- and take the body apart into a (f args) form
     let
-       subst_env = mkSubstEnv [id                   | (id,rhs) <- dict_binds']
-                              [ContEx subst_env rhs | (id,rhs) <- dict_binds']
+       subst = extendIdSubstList (mkSubst all_vars) pairs
+       pairs = [(id, ContEx subst rhs) | (id,rhs) <- dict_binds']
                        -- Note recursion here... substitution won't terminate
                        -- if there is genuine recursion... which there isn't
-
-       subst = mkSubst all_vars subst_env
        body'' = substExpr subst body'
     in