[project @ 2004-01-05 12:11:42 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 492e9ab..4fc0017 100644 (file)
--- a/ghc/compiler/typecheck/TcRules.lhs
+++ b/ghc/compiler/typecheck/TcRules.lhs
@@ -8,52 +8,31 @@ module TcRules ( tcRules ) where
 
 #include "HsVersions.h"
 
-import HsSyn           ( RuleDecl(..), RuleBndr(..), collectRuleBndrSigTys )
-import CoreSyn         ( CoreRule(..) )
-import RnHsSyn         ( RenamedRuleDecl )
-import TcHsSyn         ( TypecheckedRuleDecl, mkHsLet )
+import HsSyn           ( RuleDecl(..), LRuleDecl, RuleBndr(..), collectRuleBndrSigTys, mkHsLet )
 import TcRnMonad
 import TcSimplify      ( tcSimplifyToDicts, tcSimplifyInferCheck )
 import TcMType         ( newTyVarTy )
 import TcType          ( tyVarsOfTypes, openTypeKind )
-import TcIfaceSig      ( tcCoreExpr, tcCoreLamBndrs )
-import TcMonoType      ( tcHsSigType, UserTypeCtxt(..), tcAddScopedTyVars )
-import TcExpr          ( tcMonoExpr )
-import TcEnv           ( tcExtendLocalValEnv, tcLookupGlobalId, tcLookupId )
+import TcHsType                ( tcHsSigType, UserTypeCtxt(..), tcAddScopedTyVars )
+import TcExpr          ( tcCheckRho )
+import TcEnv           ( tcExtendLocalValEnv )
 import Inst            ( instToId )
 import Id              ( idType, mkLocalId )
+import Name            ( Name )
+import SrcLoc          ( noLoc, unLoc )
 import Outputable
 \end{code}
 
 \begin{code}
-tcRules :: [RenamedRuleDecl] -> TcM [TypecheckedRuleDecl]
-tcRules decls = mappM tcRule decls
-
-tcRule :: RenamedRuleDecl -> TcM TypecheckedRuleDecl
-tcRule (IfaceRule name act vars fun args rhs src_loc)
-  = addSrcLoc src_loc          $
-    addErrCtxt (ruleCtxt name) $
-    tcLookupGlobalId fun               `thenM` \ fun' ->
-    tcCoreLamBndrs vars                        $ \ vars' ->
-    mappM tcCoreExpr args              `thenM` \ args' ->
-    tcCoreExpr rhs                     `thenM` \ rhs' ->
-    returnM (IfaceRuleOut fun' (Rule name act vars' args' rhs'))
-
-tcRule (IfaceRuleOut fun rule) -- Built-in rules, and only built-in rules, 
-                               -- come this way.  Usually IfaceRuleOut is only
-                               -- used for the *output* of the type checker
-  = tcLookupId fun             `thenM` \ fun' ->
-       -- NB: tcLookupId, not tcLookupGlobalId
-       -- Reason: when compiling GHC.Base, where eqString is defined,
-       --         we'll get the builtin rule for eqString, but eqString
-       --         will be in the *local* type environment.
-       -- Seems like a bit of a hack
-    returnM (IfaceRuleOut fun' rule)   
-
-tcRule (HsRule name act vars lhs rhs src_loc)
-  = addSrcLoc src_loc                          $
-    addErrCtxt (ruleCtxt name)                 $
-    newTyVarTy openTypeKind                            `thenM` \ rule_ty ->
+tcRules :: [LRuleDecl Name] -> TcM [LRuleDecl TcId]
+tcRules decls = mappM (wrapLocM tcRule) decls
+
+tcRule :: RuleDecl Name -> TcM (RuleDecl TcId)
+tcRule (HsRule name act vars lhs rhs)
+  = addErrCtxt (ruleCtxt name)                 $
+    traceTc (ptext SLIT("---- Rule ------")
+                <+> ppr name)                  `thenM_` 
+    newTyVarTy openTypeKind                    `thenM` \ rule_ty ->
 
        -- Deal with the tyvars mentioned in signatures
     tcAddScopedTyVars (collectRuleBndrSigTys vars) (
@@ -63,8 +42,8 @@ tcRule (HsRule name act vars lhs rhs src_loc)
        tcExtendLocalValEnv ids                 $
        
                -- Now LHS and RHS
-       getLIE (tcMonoExpr lhs rule_ty)         `thenM` \ (lhs', lhs_lie) ->
-       getLIE (tcMonoExpr rhs rule_ty)         `thenM` \ (rhs', rhs_lie) ->
+       getLIE (tcCheckRho lhs rule_ty) `thenM` \ (lhs', lhs_lie) ->
+       getLIE (tcCheckRho rhs rule_ty) `thenM` \ (rhs', rhs_lie) ->
        
        returnM (ids, lhs', rhs', lhs_lie, rhs_lie)
     )                          `thenM` \ (ids, lhs', rhs', lhs_lie, rhs_lie) ->
@@ -108,15 +87,16 @@ tcRule (HsRule name act vars lhs rhs src_loc)
                         lhs_dicts rhs_lie      `thenM` \ (forall_tvs1, rhs_binds) ->
 
     returnM (HsRule name act
-                   (map RuleBndr (forall_tvs1 ++ tpl_ids))     -- yuk
+                   (map (RuleBndr . noLoc) (forall_tvs1 ++ tpl_ids))   -- yuk
                    (mkHsLet lhs_binds lhs')
-                   (mkHsLet rhs_binds rhs')
-                   src_loc)
+                   (mkHsLet rhs_binds rhs'))
   where
     new_id (RuleBndr var)         = newTyVarTy openTypeKind                    `thenM` \ ty ->
-                                    returnM (mkLocalId var ty)
-    new_id (RuleBndrSig var rn_ty) = tcHsSigType (RuleSigCtxt var) rn_ty       `thenM` \ ty ->
-                                    returnM (mkLocalId var ty)
+                                    returnM (mkLocalId (unLoc var) ty)
+    new_id (RuleBndrSig var rn_ty) = tcHsSigType (RuleSigCtxt nl_var) rn_ty    `thenM` \ ty ->
+                                    returnM (mkLocalId nl_var ty)
+                                  where
+                                    nl_var = unLoc var
 
 ruleCtxt name = ptext SLIT("When checking the transformation rule") <+> 
                doubleQuotes (ftext name)