[project @ 2003-11-05 14:51:53 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 fb3464d..27072a2 100644 (file)
--- a/ghc/compiler/typecheck/TcRules.lhs
+++ b/ghc/compiler/typecheck/TcRules.lhs
@@ -9,16 +9,14 @@ module TcRules ( tcRules ) where
 #include "HsVersions.h"
 
 import HsSyn           ( RuleDecl(..), RuleBndr(..), collectRuleBndrSigTys )
-import CoreSyn         ( CoreRule(..) )
 import RnHsSyn         ( RenamedRuleDecl )
 import TcHsSyn         ( TypecheckedRuleDecl, mkHsLet )
 import TcRnMonad
 import TcSimplify      ( tcSimplifyToDicts, tcSimplifyInferCheck )
 import TcMType         ( newTyVarTy )
 import TcType          ( tyVarsOfTypes, openTypeKind )
-import TcIfaceSig      ( tcCoreExpr, tcCoreLamBndrs, tcVar )
-import TcMonoType      ( tcHsSigType, UserTypeCtxt(..), tcAddScopedTyVars )
-import TcExpr          ( tcMonoExpr )
+import TcHsType                ( tcHsSigType, UserTypeCtxt(..), tcAddScopedTyVars )
+import TcExpr          ( tcCheckRho )
 import TcEnv           ( tcExtendLocalValEnv )
 import Inst            ( instToId )
 import Id              ( idType, mkLocalId )
@@ -30,23 +28,12 @@ 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) $
-    tcVar 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 come this way
-  = tcVar fun                          `thenM` \ fun' ->
-    returnM (IfaceRuleOut fun' rule)   
-
 tcRule (HsRule name act vars lhs rhs src_loc)
   = addSrcLoc src_loc                          $
     addErrCtxt (ruleCtxt name)                 $
-    newTyVarTy openTypeKind                            `thenM` \ rule_ty ->
+    traceTc (ptext SLIT("---- Rule ------")
+                <+> ppr name)                  `thenM_` 
+    newTyVarTy openTypeKind                    `thenM` \ rule_ty ->
 
        -- Deal with the tyvars mentioned in signatures
     tcAddScopedTyVars (collectRuleBndrSigTys vars) (
@@ -56,8 +43,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) ->