[project @ 2003-06-27 18:28:31 by sof]

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

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 5880de0..7c5cc8c 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -10,7 +10,7 @@ module Desugar ( deSugar, deSugarExpr ) where
 
 import CmdLineOpts     ( DynFlag(..), dopt, opt_SccProfilingOn )
 import HscTypes                ( ModGuts(..), ModGuts, HscEnv(..), ExternalPackageState(..), 
-                         PersistentCompilerState(..), Dependencies(..),
+                         PersistentCompilerState(..), Dependencies(..), TypeEnv, GlobalRdrEnv,
                          lookupType, unQualInScope )
 import HsSyn           ( MonoBinds, RuleDecl(..), RuleBndr(..), 
                          HsExpr(..), HsBinds(..), MonoBinds(..) )
@@ -38,6 +38,7 @@ import ErrUtils               ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings, addShortWarnLocLine
 import Outputable
 import qualified Pretty
 import UniqSupply      ( mkSplitUniqSupply )
+import Maybes          ( orElse )
 import SrcLoc          ( SrcLoc )
 import FastString
 import DATA_IOREF      ( readIORef )
@@ -128,26 +129,24 @@ deSugar hsc_env pcs
     hpt      = hsc_HPT hsc_env
     lookup n = case lookupType hpt pte n of {
                 Just v -> v ;
-                other -> 
+                other  -> 
               case lookupNameEnv type_env n of
                 Just v -> v ;
-                other         -> pprPanic "Desugar: lookup:" (ppr n)
+                other  -> pprPanic "Desugar: lookup:" (ppr n)
                }
 
 deSugarExpr :: HscEnv
            -> PersistentCompilerState
-           -> Module -> PrintUnqualified
+           -> Module -> GlobalRdrEnv -> TypeEnv 
            -> TypecheckedHsExpr
            -> IO CoreExpr
-deSugarExpr hsc_env pcs mod_name unqual tc_expr
+deSugarExpr hsc_env pcs this_mod rdr_env type_env tc_expr
   = do { showPass dflags "Desugar"
        ; us <- mkSplitUniqSupply 'd'
 
        -- Do desugaring
-       ; let (core_expr, ds_warns) = initDs dflags us lookup mod_name (dsExpr tc_expr)    
+       ; let (core_expr, ds_warns) = initDs dflags us lookup this_mod (dsExpr tc_expr)    
              warn_doc = pprBagOfWarnings (mapBag mk_warn ds_warns)
-             mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc)
-             mk_warn (loc,sdoc) = addShortWarnLocLine loc unqual sdoc
 
        -- Display any warnings
         ; doIfSet (not (isEmptyBag ds_warns))
@@ -162,9 +161,15 @@ deSugarExpr hsc_env pcs mod_name unqual tc_expr
     dflags   = hsc_dflags hsc_env
     hpt      = hsc_HPT hsc_env
     pte      = eps_PTE (pcs_EPS pcs)
-    lookup n = case lookupType hpt pte n of
-                Just v -> v 
-                other  -> pprPanic "Desugar: lookup:" (ppr n)
+    lookup n = lookupNameEnv type_env n        `orElse`        -- Look in the type env of the
+                                                       -- current module first
+              lookupType hpt pte n     `orElse`        -- Then other modules
+              pprPanic "Desugar: lookup:" (ppr n)
+
+    mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc)
+    mk_warn (loc,sdoc) = addShortWarnLocLine loc print_unqual sdoc
+
+    print_unqual = unQualInScope rdr_env
 
 dsProgram all_binds rules fo_decls
   = dsMonoBinds auto_scc all_binds []  `thenDs` \ core_prs ->