X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcHsSyn.lhs;h=ec93e8464131aa2fdcfe36f55def1c28378baef5;hb=3f1b316d7035c55cd712cd39a9981339bcef2e8c;hp=eaa7b23331ae75fe99e3a87874cea787bf1349bc;hpb=74b27e20425336403d80e942ee3faf00f8c36ef8;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcHsSyn.lhs b/compiler/typecheck/TcHsSyn.lhs
index eaa7b23..ec93e84 100644
--- a/compiler/typecheck/TcHsSyn.lhs
+++ b/compiler/typecheck/TcHsSyn.lhs
@@ -9,6 +9,13 @@ This module is an extension of @HsSyn@ syntax, for use in the type
 checker.
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module TcHsSyn (
 	mkHsConApp, mkHsDictLet, mkHsApp,
 	hsLitType, hsLPatType, hsPatType, 
@@ -78,12 +85,13 @@ hsPatType (BangPat pat)		    = hsLPatType pat
 hsPatType (LazyPat pat)		    = hsLPatType pat
 hsPatType (LitPat lit)		    = hsLitType lit
 hsPatType (AsPat var pat)	    = idType (unLoc var)
+hsPatType (ViewPat expr pat ty)     = ty
 hsPatType (ListPat _ ty)	    = mkListTy ty
 hsPatType (PArrPat _ ty)	    = mkPArrTy ty
 hsPatType (TuplePat pats box ty)    = ty
 hsPatType (ConPatOut{ pat_ty = ty })= ty
 hsPatType (SigPatOut pat ty)	    = ty
-hsPatType (NPat lit _ _ ty)	    = ty
+hsPatType (NPat lit _ _)	    = overLitType lit
 hsPatType (NPlusKPat id _ _ _)      = idType (unLoc id)
 hsPatType (CoPat _ _ ty)	    = ty
 
@@ -186,6 +194,13 @@ zonkIdBndr env id
 zonkIdBndrs :: ZonkEnv -> [TcId] -> TcM [Id]
 zonkIdBndrs env ids = mappM (zonkIdBndr env) ids
 
+zonkDictBndrs :: ZonkEnv -> [Var] -> TcM [Var]
+-- "Dictionary" binders can be coercion variables or dictionary variables
+zonkDictBndrs env ids = mappM (zonkDictBndr env) ids
+
+zonkDictBndr env var | isTyVar var = return var
+		     | otherwise   = zonkIdBndr env var
+
 zonkTopBndrs :: [TcId] -> TcM [Id]
 zonkTopBndrs ids = zonkIdBndrs emptyZonkEnv ids
 \end{code}
@@ -279,7 +294,7 @@ zonk_bind env bind@(FunBind { fun_id = var, fun_matches = ms, fun_co_fn = co_fn
 zonk_bind env (AbsBinds { abs_tvs = tyvars, abs_dicts = dicts, 
 			  abs_exports = exports, abs_binds = val_binds })
   = ASSERT( all isImmutableTyVar tyvars )
-    zonkIdBndrs env dicts		`thenM` \ new_dicts ->
+    zonkDictBndrs env dicts			`thenM` \ new_dicts ->
     fixM (\ ~(new_val_binds, _) ->
 	let
 	  env1 = extendZonkEnv env new_dicts
@@ -452,16 +467,16 @@ zonkExpr env (ExplicitTuple exprs boxed)
     returnM (ExplicitTuple new_exprs boxed)
 
 zonkExpr env (RecordCon data_con con_expr rbinds)
-  = zonkExpr env con_expr	`thenM` \ new_con_expr ->
-    zonkRbinds env rbinds	`thenM` \ new_rbinds ->
-    returnM (RecordCon data_con new_con_expr new_rbinds)
+  = do	{ new_con_expr <- zonkExpr env con_expr
+	; new_rbinds   <- zonkRecFields env rbinds
+	; return (RecordCon data_con new_con_expr new_rbinds) }
 
 zonkExpr env (RecordUpd expr rbinds cons in_tys out_tys)
-  = zonkLExpr env expr			`thenM` \ new_expr ->
-    mapM (zonkTcTypeToType env) in_tys	`thenM` \ new_in_tys ->
-    mapM (zonkTcTypeToType env) out_tys	`thenM` \ new_out_tys ->
-    zonkRbinds env rbinds		`thenM` \ new_rbinds ->
-    returnM (RecordUpd new_expr new_rbinds cons new_in_tys new_out_tys)
+  = do	{ new_expr    <- zonkLExpr env expr
+	; new_in_tys  <- mapM (zonkTcTypeToType env) in_tys
+	; new_out_tys <- mapM (zonkTcTypeToType env) out_tys
+	; new_rbinds  <- zonkRecFields env rbinds
+	; return (RecordUpd new_expr new_rbinds cons new_in_tys new_out_tys) }
 
 zonkExpr env (ExprWithTySigOut e ty) 
   = do { e' <- zonkLExpr env e
@@ -528,7 +543,8 @@ zonk_cmd_top env (HsCmdTop cmd stack_tys ty ids)
 
 -------------------------------------------------------------------------
 zonkCoFn :: ZonkEnv -> HsWrapper -> TcM (ZonkEnv, HsWrapper)
-zonkCoFn env WpHole = return (env, WpHole)
+zonkCoFn env WpHole   = return (env, WpHole)
+zonkCoFn env WpInline = return (env, WpInline)
 zonkCoFn env (WpCompose c1 c2) = do { (env1, c1') <- zonkCoFn env c1
 				    ; (env2, c2') <- zonkCoFn env1 c2
 				    ; return (env2, WpCompose c1' c2') }
@@ -554,12 +570,17 @@ zonkDo env do_or_lc      = do_or_lc
 
 -------------------------------------------------------------------------
 zonkOverLit :: ZonkEnv -> HsOverLit TcId -> TcM (HsOverLit Id)
-zonkOverLit env (HsIntegral i e)
-  = do	{ e' <- zonkExpr env e; return (HsIntegral i e') }
-zonkOverLit env (HsFractional r e)
-  = do	{ e' <- zonkExpr env e; return (HsFractional r e') }
-zonkOverLit env (HsIsString s e)
-  = do	{ e' <- zonkExpr env e; return (HsIsString s e') }
+zonkOverLit env ol = 
+    let 
+        zonkedStuff = do ty' <- zonkTcTypeToType env (overLitType ol)
+                         e' <- zonkExpr env (overLitExpr ol)
+                         return (e', ty')
+        ru f (x, y) = return (f x y)
+    in
+      case ol of 
+        (HsIntegral i _ _)   -> ru (HsIntegral i) =<< zonkedStuff
+        (HsFractional r _ _) -> ru (HsFractional r) =<< zonkedStuff
+        (HsIsString s _ _)   -> ru (HsIsString s) =<< zonkedStuff
 
 -------------------------------------------------------------------------
 zonkArithSeq :: ZonkEnv -> ArithSeqInfo TcId -> TcM (ArithSeqInfo Id)
@@ -639,14 +660,15 @@ zonkStmt env (BindStmt pat expr bind_op fail_op)
 
 
 -------------------------------------------------------------------------
-zonkRbinds :: ZonkEnv -> HsRecordBinds TcId -> TcM (HsRecordBinds Id)
-
-zonkRbinds env (HsRecordBinds rbinds)
-  = mappM zonk_rbind rbinds >>= return . HsRecordBinds
+zonkRecFields :: ZonkEnv -> HsRecordBinds TcId -> TcM (HsRecordBinds TcId)
+zonkRecFields env (HsRecFields flds dd)
+  = do	{ flds' <- mappM zonk_rbind flds
+	; return (HsRecFields flds' dd) }
   where
-    zonk_rbind (field, expr)
-      = zonkLExpr env expr	`thenM` \ new_expr ->
-	returnM (fmap (zonkIdOcc env) field, new_expr)
+    zonk_rbind fld
+      = do { new_expr <- zonkLExpr env (hsRecFieldArg fld)
+	   ; return (fld { hsRecFieldArg = new_expr }) }
+	-- Field selectors have declared types; hence no zonking
 
 -------------------------------------------------------------------------
 mapIPNameTc :: (a -> TcM b) -> IPName a -> TcM (IPName b)
@@ -697,6 +719,11 @@ zonk_pat env (AsPat (L loc v) pat)
 	; (env', pat') <- zonkPat (extendZonkEnv1 env v') pat
  	; return (env', AsPat (L loc v') pat') }
 
+zonk_pat env (ViewPat expr pat ty)
+  = do	{ expr' <- zonkLExpr env expr
+	; (env', pat') <- zonkPat env pat
+ 	; return (env', ViewPat expr' pat' ty) }
+
 zonk_pat env (ListPat pats ty)
   = do	{ ty' <- zonkTcTypeToType env ty
 	; (env', pats') <- zonkPats env pats
@@ -729,15 +756,14 @@ zonk_pat env (SigPatOut pat ty)
 	; (env', pat') <- zonkPat env pat
 	; return (env', SigPatOut pat' ty') }
 
-zonk_pat env (NPat lit mb_neg eq_expr ty)
+zonk_pat env (NPat lit mb_neg eq_expr)
   = do	{ lit' <- zonkOverLit env lit
  	; mb_neg' <- case mb_neg of
 			Nothing  -> return Nothing
 			Just neg -> do { neg' <- zonkExpr env neg
 				       ; return (Just neg') }
  	; eq_expr' <- zonkExpr env eq_expr
-	; ty' <- zonkTcTypeToType env ty
-	; return (env, NPat lit' mb_neg' eq_expr' ty') }
+	; return (env, NPat lit' mb_neg' eq_expr') }
 
 zonk_pat env (NPlusKPat (L loc n) lit e1 e2)
   = do	{ n' <- zonkIdBndr env n
@@ -764,11 +790,11 @@ zonkConStuff env (InfixCon p1 p2)
 	; (env', p2') <- zonkPat env1 p2
 	; return (env', InfixCon p1' p2') }
 
-zonkConStuff env (RecCon rpats)
-  = do	{ let (fields, pats) = unzip [ (f, p) | HsRecField f p _  <- rpats ]
-	; (env', pats') <- zonkPats env pats
-	; let recCon = RecCon [ mkRecField f p | (f, p) <- zip fields pats' ]
-	; returnM (env', recCon) }
+zonkConStuff env (RecCon (HsRecFields rpats dd))
+  = do	{ (env', pats') <- zonkPats env (map hsRecFieldArg rpats)
+	; let rpats' = zipWith (\rp p' -> rp { hsRecFieldArg = p' }) rpats pats'
+	; returnM (env', RecCon (HsRecFields rpats' dd)) }
+	-- Field selectors have declared types; hence no zonking
 
 ---------------------------
 zonkPats env []		= return (env, [])