From: simonpj Date: Wed, 5 Feb 2003 11:39:27 +0000 (+0000) Subject: [project @ 2003-02-05 11:39:26 by simonpj] X-Git-Tag: Approx_11550_changesets_converted~1206 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=319346a40a4691a7ed3f1f460ef9288050d22ccd;p=ghc-hetmet.git [project @ 2003-02-05 11:39:26 by simonpj] Type sigs and comments only --- diff --git a/ghc/compiler/hsSyn/HsDecls.lhs b/ghc/compiler/hsSyn/HsDecls.lhs index ca0e324..1b7d389 100644 --- a/ghc/compiler/hsSyn/HsDecls.lhs +++ b/ghc/compiler/hsSyn/HsDecls.lhs @@ -840,6 +840,7 @@ data RuleDecl name name -- Head of LHS CoreRule +isSrcRule :: RuleDecl name -> Bool isSrcRule (HsRule _ _ _ _ _ _) = True isSrcRule other = False diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index c532871..336e2ce 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -717,8 +717,9 @@ initExternalPackageState where gated_decl = (gate_fn, (mod, IfaceRuleOut rdr_name rule)) mod = nameModule name - rdr_name = nameRdrName name - gate_fn vis_fn = vis_fn name -- Load the rule whenever name is visible + rdr_name = nameRdrName name -- Seems a bit of a hack to go back + -- to the RdrName + gate_fn vis_fn = vis_fn name -- Load the rule whenever name is visible initOrigNames :: OrigNameCache initOrigNames diff --git a/ghc/compiler/typecheck/TcExpr.lhs b/ghc/compiler/typecheck/TcExpr.lhs index 025c7dc..f134c78 100644 --- a/ghc/compiler/typecheck/TcExpr.lhs +++ b/ghc/compiler/typecheck/TcExpr.lhs @@ -12,8 +12,7 @@ module TcExpr ( tcExpr, tcExpr_id, tcMonoExpr ) where import {-# SOURCE #-} TcSplice( tcSpliceExpr, tcBracket ) import HsSyn ( HsReify(..), ReifyFlavour(..) ) import TcType ( isTauTy ) -import TcEnv ( bracketOK, tcMetaTy, tcLookupGlobal, - checkWellStaged, metaLevel ) +import TcEnv ( bracketOK, tcMetaTy, checkWellStaged, metaLevel ) import TcSimplify ( tcSimplifyBracket ) import Name ( isExternalName ) import qualified DsMeta