[project @ 2000-12-19 13:06:50 by simonmar]

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

diff --git a/ghc/compiler/typecheck/TcRules.lhs b/ghc/compiler/typecheck/TcRules.lhs
index 3e3e90f..6a2a0b3 100644 (file)
--- a/ghc/compiler/typecheck/TcRules.lhs
+++ b/ghc/compiler/typecheck/TcRules.lhs
@@ -4,14 +4,14 @@
 \section[TcRules]{Typechecking transformation rules}
 
 \begin{code}
-module TcRules ( tcRules ) where
+module TcRules ( tcIfaceRules, tcSourceRules ) where
 
 #include "HsVersions.h"
 
-import HsSyn           ( HsDecl(..), RuleDecl(..), RuleBndr(..) )
+import HsSyn           ( RuleDecl(..), RuleBndr(..) )
 import CoreSyn         ( CoreRule(..) )
-import RnHsSyn         ( RenamedHsDecl, RenamedRuleDecl )
-import HscTypes                ( PackageRuleEnv )
+import RnHsSyn         ( RenamedRuleDecl )
+import HscTypes                ( PackageRuleBase )
 import TcHsSyn         ( TypecheckedRuleDecl, mkHsLet )
 import TcMonad
 import TcSimplify      ( tcSimplifyToDicts, tcSimplifyAndCheck )
@@ -19,11 +19,11 @@ import TcType               ( zonkTcTypes, zonkTcTyVarToTyVar, newTyVarTy )
 import TcIfaceSig      ( tcCoreExpr, tcCoreLamBndrs, tcVar )
 import TcMonoType      ( kcHsSigType, tcHsSigType, tcTyVars, checkSigTyVars )
 import TcExpr          ( tcExpr )
-import TcEnv           ( tcExtendLocalValEnv, tcExtendTyVarEnv )
+import TcEnv           ( tcExtendLocalValEnv, tcExtendTyVarEnv, isLocalThing )
 import Rules           ( extendRuleBase )
 import Inst            ( LIE, plusLIEs, instToId )
 import Id              ( idType, idName, mkVanillaId )
-import Name            ( Name, extendNameEnvList )
+import Module          ( Module )
 import VarSet
 import Type            ( tyVarsOfTypes, openTypeKind )
 import Bag             ( bagToList )
@@ -32,20 +32,24 @@ import Outputable
 \end{code}
 
 \begin{code}
-tcRules :: PackageRuleEnv -> [RenamedHsDecl] -> TcM (PackageRuleEnv, LIE, [TypecheckedRuleDecl])
-tcRules pkg_rule_env decls 
-  = mapAndUnzipTc tcLocalRule local_rules      `thenTc` \ (lies, new_local_rules) ->
-    mapTc tcIfaceRule imported_rules           `thenTc` \ new_imported_rules ->
-    returnTc (extendRuleBaseList pkg_rule_env new_imported_rules,
-             plusLIEs lies, new_local_rules)
+tcIfaceRules :: PackageRuleBase -> Module -> [RenamedRuleDecl] 
+            -> TcM (PackageRuleBase, [TypecheckedRuleDecl])
+tcIfaceRules pkg_rule_base mod decls 
+  = 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
-    rule_decls = [rule | RuleD rule <- decls]
-    (imported_rules, local_rules) = partition is_iface_rule rule_decls
+    add rule_base (IfaceRuleOut id rule) = extendRuleBase rule_base (id, rule)
 
-    is_iface_rule (IfaceRule _ _ _ _ _ _) = True
-    is_iface_rule other                          = False
+       -- When relinking this module from its interface-file decls
+       -- we'll have IfaceRules that are in fact local to this module
+    is_local (IfaceRuleOut n _) = isLocalThing mod n
+    is_local other             = True
 
-tcIfaceRule :: RenamedRuleDecl -> TcM (Id, CoreRule)
+tcIfaceRule :: RenamedRuleDecl -> TcM TypecheckedRuleDecl
   -- No zonking necessary!
 tcIfaceRule (IfaceRule name vars fun args rhs src_loc)
   = tcAddSrcLoc src_loc                $
@@ -54,10 +58,15 @@ tcIfaceRule (IfaceRule name vars fun args rhs src_loc)
     tcCoreLamBndrs vars                        $ \ vars' ->
     mapTc tcCoreExpr args              `thenTc` \ args' ->
     tcCoreExpr rhs                     `thenTc` \ rhs' ->
-    returnTc (fun', Rule name vars' args' rhs')
+    returnTc (IfaceRuleOut fun' (Rule name vars' args' rhs'))
+
+
+tcSourceRules :: [RenamedRuleDecl] -> TcM (LIE, [TypecheckedRuleDecl])
+tcSourceRules decls
+  = mapAndUnzipTc tcSourceRule decls   `thenTc` \ (lies, decls') ->
+    returnTc (plusLIEs lies, decls')
 
-tcLocalRule :: RenamedRuleDecl -> TcM (LIE, TypecheckedRuleDecl)
-tcLocalRule (HsRule name sig_tvs vars lhs rhs src_loc)
+tcSourceRule (HsRule name sig_tvs vars lhs rhs src_loc)
   = tcAddSrcLoc src_loc                                $
     tcAddErrCtxt (ruleCtxt name)                       $
     newTyVarTy openTypeKind                            `thenNF_Tc` \ rule_ty ->