X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsHsSyn.lhs;h=f7c78f04fbcfc08f764335612a594e0238b7afe0;hb=180097ce1628a67c97f54b313268600ed1756652;hp=3adfab126ed7c6a41f7fb078d6e3808da010e5fc;hpb=b4255f2c320f852d7dfb0afc0bc9f64765aece0c;p=ghc-hetmet.git

diff --git a/ghc/compiler/deSugar/DsHsSyn.lhs b/ghc/compiler/deSugar/DsHsSyn.lhs
index 3adfab1..f7c78f0 100644
--- a/ghc/compiler/deSugar/DsHsSyn.lhs
+++ b/ghc/compiler/deSugar/DsHsSyn.lhs
@@ -1,26 +1,25 @@
 %
-% (c) The AQUA Project, Glasgow University, 1996
+% (c) The AQUA Project, Glasgow University, 1996-1998
 %
 \section[DsHsSyn]{Haskell abstract syntax---added things for desugarer}
 
 \begin{code}
-#include "HsVersions.h"
-
 module DsHsSyn where
 
-import Ubiq
+#include "HsVersions.h"
 
-import HsSyn		( OutPat(..), HsBinds(..), Bind(..), MonoBinds(..),
-			  Sig, HsExpr, GRHSsAndBinds, Match, HsLit )
-import TcHsSyn		( TypecheckedPat(..), TypecheckedBind(..), 
-			  TypecheckedMonoBinds(..) )
+import HsSyn		( OutPat(..), MonoBinds(..) )
+import TcHsSyn		( TypecheckedPat,
+			  TypecheckedMonoBinds )
 
-import Id		( idType )
-import PrelInfo		( mkListTy, mkTupleTy, unitTy )
-import Util		( panic )
+import Id		( idType, Id )
+import Type             ( Type )
+import TysWiredIn	( mkListTy, mkTupleTy, unitTy )
+import BasicTypes	( Boxity(..) )
+import Panic		( panic )
 \end{code}
 
-Note: If @outPatType@ doesn't bear a strong resemblance to @coreExprType@,
+Note: If @outPatType@ doesn't bear a strong resemblance to @exprType@,
 then something is wrong.
 \begin{code}
 outPatType :: TypecheckedPat -> Type
@@ -29,47 +28,50 @@ outPatType (WildPat ty)		= ty
 outPatType (VarPat var)		= idType var
 outPatType (LazyPat pat)	= outPatType pat
 outPatType (AsPat var pat)	= idType var
-outPatType (ConPat _ ty _)	= ty
-outPatType (ConOpPat _ _ _ ty)	= ty
+outPatType (ConPat _ ty _ _ _)	= ty
 outPatType (ListPat ty _)	= mkListTy ty
-outPatType (TuplePat pats)	= mkTupleTy (length pats) (map outPatType pats)
+outPatType (TuplePat pats box)	= mkTupleTy box (length pats) (map outPatType pats)
+outPatType (RecPat _ ty _ _ _)  = ty
 outPatType (LitPat lit ty)	= ty
 outPatType (NPat lit ty _)	= ty
-outPatType (DictPat ds ms)      = case (length ds + length ms) of
+outPatType (NPlusKPat _ _ ty _ _) = ty
+outPatType (DictPat ds ms)      = case (length ds_ms) of
 				    0 -> unitTy
-				    1 -> idType (head (ds ++ ms))
-				    n -> mkTupleTy n (map idType (ds ++ ms))
+				    1 -> idType (head ds_ms)
+				    n -> mkTupleTy Boxed n (map idType ds_ms)
+				   where
+				    ds_ms = ds ++ ms
 \end{code}
 
 
-Nota bene: DsBinds relies on the fact that at least for simple
+Nota bene: @DsBinds@ relies on the fact that at least for simple
 tuple patterns @collectTypedPatBinders@ returns the binders in
 the same order as they appear in the tuple.
 
-collectTypedBinders and collectedTypedPatBinders are the exportees.
+@collectTypedBinders@ and @collectedTypedPatBinders@ are the exportees.
 
 \begin{code}
-collectTypedBinders :: TypecheckedBind -> [Id]
-collectTypedBinders EmptyBind	    = []
-collectTypedBinders (NonRecBind bs) = collectTypedMonoBinders bs
-collectTypedBinders (RecBind    bs) = collectTypedMonoBinders bs
-
 collectTypedMonoBinders :: TypecheckedMonoBinds -> [Id]
-collectTypedMonoBinders EmptyMonoBinds	      = []
-collectTypedMonoBinders (PatMonoBind pat _ _) = collectTypedPatBinders pat
-collectTypedMonoBinders (FunMonoBind f _ _ _) = [f]
-collectTypedMonoBinders (VarMonoBind v _)     = [v]
+collectTypedMonoBinders EmptyMonoBinds	        = []
+collectTypedMonoBinders (PatMonoBind pat _ _)   = collectTypedPatBinders pat
+collectTypedMonoBinders (FunMonoBind f _ _ _)   = [f]
+collectTypedMonoBinders (VarMonoBind v _)       = [v]
+collectTypedMonoBinders (CoreMonoBind v _)      = [v]
 collectTypedMonoBinders (AndMonoBinds bs1 bs2)
  = collectTypedMonoBinders bs1 ++ collectTypedMonoBinders bs2
+collectTypedMonoBinders (AbsBinds _ _ exports _ _)
+  = [global | (_, global, local) <- exports]
 
 collectTypedPatBinders :: TypecheckedPat -> [Id]
-collectTypedPatBinders (VarPat var)	    = [var]
-collectTypedPatBinders (LazyPat pat)	    = collectTypedPatBinders pat
-collectTypedPatBinders (AsPat a pat)	    = a : collectTypedPatBinders pat
-collectTypedPatBinders (ConPat _ _ pats)    = concat (map collectTypedPatBinders pats)
-collectTypedPatBinders (ConOpPat p1 _ p2 _) = collectTypedPatBinders p1 ++ collectTypedPatBinders p2
-collectTypedPatBinders (ListPat t pats)     = concat (map collectTypedPatBinders pats)
-collectTypedPatBinders (TuplePat pats)	    = concat (map collectTypedPatBinders pats)
-collectTypedPatBinders (DictPat ds ms)	    = ds ++ ms
-collectTypedPatBinders any_other_pat	    = [ {-no binders-} ]
+collectTypedPatBinders (VarPat var)	       = [var]
+collectTypedPatBinders (LazyPat pat)	       = collectTypedPatBinders pat
+collectTypedPatBinders (AsPat a pat)	       = a : collectTypedPatBinders pat
+collectTypedPatBinders (ConPat _ _ _ _ pats)   = concat (map collectTypedPatBinders pats)
+collectTypedPatBinders (ListPat t pats)        = concat (map collectTypedPatBinders pats)
+collectTypedPatBinders (TuplePat pats _)       = concat (map collectTypedPatBinders pats)
+collectTypedPatBinders (RecPat _ _ _ _ fields) = concat (map (\ (f,pat,_) -> collectTypedPatBinders pat)
+							  fields)
+collectTypedPatBinders (DictPat ds ms)	       = ds ++ ms
+collectTypedPatBinders (NPlusKPat var _ _ _ _) = [var]
+collectTypedPatBinders any_other_pat	       = [ {-no binders-} ]
 \end{code}