[project @ 2001-09-26 16:19:28 by simonpj]

[ghc-hetmet.git] / ghc / compiler / typecheck / TcRules.lhs

diff --git a/ghc/compiler/typecheck/TcRules.lhs b/ghc/compiler/typecheck/TcRules.lhs
index d041fc9..8af0a53 100644 (file)
--- a/ghc/compiler/typecheck/TcRules.lhs
+++ b/ghc/compiler/typecheck/TcRules.lhs
@@ -17,10 +17,10 @@ import TcMonad
 import TcSimplify      ( tcSimplifyToDicts, tcSimplifyInferCheck )
 import TcMType         ( newTyVarTy )
 import TcType          ( tyVarsOfTypes, openTypeKind )
-import TcIfaceSig      ( tcCoreExpr, tcCoreLamBndrs, tcVar )
+import TcIfaceSig      ( tcCoreExpr, tcCoreLamBndrs, tcVar, tcDelay )
 import TcMonoType      ( kcHsSigTypes, tcHsSigType, UserTypeCtxt(..), tcScopedTyVars )
 import TcExpr          ( tcExpr )
-import TcEnv           ( tcExtendLocalValEnv, isLocalThing )
+import TcEnv           ( RecTcEnv, tcExtendLocalValEnv, isLocalThing )
 import Rules           ( extendRuleBase )
 import Inst            ( LIE, plusLIEs, instToId )
 import Id              ( idName, idType, mkLocalId )
@@ -30,16 +30,21 @@ import Outputable
 \end{code}
 
 \begin{code}
-tcIfaceRules :: PackageRuleBase -> Module -> [RenamedRuleDecl] 
+tcIfaceRules :: RecTcEnv -> PackageRuleBase -> Module -> [RenamedRuleDecl] 
             -> TcM (PackageRuleBase, [TypecheckedRuleDecl])
-tcIfaceRules pkg_rule_base mod decls 
-  = mapTc tcIfaceRule decls            `thenTc` \ new_rules ->
+tcIfaceRules unf_env pkg_rule_base mod decls 
+  = tcDelay unf_env doc [] (
+       -- We need the recursive env because the built-in rules show up as
+       -- IfaceOut rules, sot they get typechecked by tcIfaceRules 
+       mapTc tcIfaceRule decls
+    )                          `thenTc` \ new_rules ->
     let
        (local_rules, imported_rules) = partition is_local new_rules
        new_rule_base = foldl add pkg_rule_base imported_rules
     in
     returnTc (new_rule_base, local_rules)
   where
+    doc = text "tcIfaceRules"
     add rule_base (IfaceRuleOut id rule) = extendRuleBase rule_base (id, rule)
 
        -- When relinking this module from its interface-file decls
@@ -49,25 +54,25 @@ tcIfaceRules pkg_rule_base mod decls
 
 tcIfaceRule :: RenamedRuleDecl -> TcM TypecheckedRuleDecl
   -- No zonking necessary!
-tcIfaceRule rule@(IfaceRule name vars fun args rhs src_loc)
+tcIfaceRule (IfaceRule name act vars fun args rhs src_loc)
   = tcAddSrcLoc src_loc                $
     tcAddErrCtxt (ruleCtxt name)       $
     tcVar fun                          `thenTc` \ fun' ->
     tcCoreLamBndrs vars                        $ \ vars' ->
     mapTc tcCoreExpr args              `thenTc` \ args' ->
     tcCoreExpr rhs                     `thenTc` \ rhs' ->
-    let
-       new_rule :: TypecheckedRuleDecl
-       new_rule = IfaceRuleOut fun' (Rule name vars' args' rhs')
-    in
-    returnTc new_rule
+    returnTc (IfaceRuleOut fun' (Rule name act vars' args' rhs'))
+
+tcIfaceRule (IfaceRuleOut fun rule)    -- Built-in rules come this way
+  = tcVar fun                          `thenTc` \ fun' ->
+    returnTc (IfaceRuleOut fun' rule)   
 
 tcSourceRules :: [RenamedRuleDecl] -> TcM (LIE, [TypecheckedRuleDecl])
 tcSourceRules decls
   = mapAndUnzipTc tcSourceRule decls   `thenTc` \ (lies, decls') ->
     returnTc (plusLIEs lies, decls')
 
-tcSourceRule (HsRule name sig_tvs vars lhs rhs src_loc)
+tcSourceRule (HsRule name act sig_tvs vars lhs rhs src_loc)
   = tcAddSrcLoc src_loc                                $
     tcAddErrCtxt (ruleCtxt name)                       $
     newTyVarTy openTypeKind                            `thenNF_Tc` \ rule_ty ->
@@ -125,7 +130,7 @@ tcSourceRule (HsRule name sig_tvs vars lhs rhs src_loc)
                         forall_tvs
                         lhs_dicts rhs_lie      `thenTc` \ (forall_tvs1, lie', rhs_binds) ->
 
-    returnTc (lie', HsRule     name forall_tvs1
+    returnTc (lie', HsRule     name act forall_tvs1
                                (map RuleBndr tpl_ids)  -- yuk
                                (mkHsLet lhs_binds lhs')
                                (mkHsLet rhs_binds rhs')