[project @ 1996-04-05 08:26:04 by partain]

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

diff --git a/ghc/compiler/typecheck/TcMonoType.lhs b/ghc/compiler/typecheck/TcMonoType.lhs
index 4ed8e50..1825cdf 100644 (file)
--- a/ghc/compiler/typecheck/TcMonoType.lhs
+++ b/ghc/compiler/typecheck/TcMonoType.lhs
@@ -18,21 +18,21 @@ import RnHsSyn              ( RenamedPolyType(..), RenamedMonoType(..),
 
 import TcMonad
 import TcEnv           ( tcLookupTyVar, tcLookupClass, tcLookupTyCon, 
-                         tcExtendTyVarEnv, tcTyVarScope
+                         tcTyVarScope, tcTyVarScopeGivenKinds
                        )
 import TcKind          ( TcKind, mkTcTypeKind, mkBoxedTypeKind,
                          mkTcArrowKind, unifyKind, newKindVar,
                          kindToTcKind
                        )
-import ErrUtils                ( arityErr )
 import Type            ( GenType, Type(..), ThetaType(..), 
-                         mkTyVarTy, mkTyConTy, mkFunTy, mkAppTy,
+                         mkTyVarTy, mkTyConTy, mkFunTy, mkAppTy, mkSynTy,
                          mkSigmaTy
                        )
 import TyVar           ( GenTyVar, TyVar(..), mkTyVar )
 import PrelInfo                ( mkListTy, mkTupleTy )
 import Type            ( mkDictTy )
 import Class           ( cCallishClassKeys )
+import TyCon           ( TyCon, Arity(..) )
 import Unique          ( Unique )
 import Name            ( Name(..), getNameShortName, isTyConName, getSynNameArity )
 import PprStyle
@@ -78,33 +78,28 @@ tcMonoTypeKind (MonoFunTy ty1 ty2)
     tcMonoType ty2     `thenTc` \ tau_ty2 ->
     returnTc (mkTcTypeKind, mkFunTy tau_ty1 tau_ty2)
 
-tcMonoTypeKind (MonoTyApp name tys)
-  = mapAndUnzipTc tcMonoTypeKind tys   `thenTc`    \ (arg_kinds, arg_tys) ->
-
-    tc_mono_name name                  `thenNF_Tc` \ (fun_kind, fun_ty) ->
-
-    newKindVar                         `thenNF_Tc` \ result_kind ->
-    unifyKind fun_kind (foldr mkTcArrowKind result_kind arg_kinds)     `thenTc_`
-
-       -- Check for saturated application in the special case of
-       -- type synoyms.  Here the renamer has kindly attached the
-       -- arity to the Name.
-    synArityCheck name (length tys)    `thenTc_`
-
-    returnTc (result_kind, foldl mkAppTy fun_ty arg_tys)
+tcMonoTypeKind (MonoTyApp name@(Short _ _) tys)
+  =    -- Must be a type variable
+    tcLookupTyVar name                 `thenNF_Tc` \ (kind,tyvar) ->
+    tcMonoTyApp kind (mkTyVarTy tyvar) tys
 
+tcMonoTypeKind (MonoTyApp name tys)
+  | isTyConName name   -- Must be a type constructor
+  = tcLookupTyCon name                 `thenNF_Tc` \ (kind,maybe_arity,tycon) ->
+    case maybe_arity of
+       Just arity -> tcSynApp name kind arity tycon tys        -- synonum
+       Nothing    -> tcMonoTyApp kind (mkTyConTy tycon) tys    -- newtype or data
+       
 -- for unfoldings only:
 tcMonoTypeKind (MonoForAllTy tyvars_w_kinds ty)
-  = tcExtendTyVarEnv tyvar_names (tc_kinds `zip` tyvars) (
+  = tcTyVarScopeGivenKinds names tc_kinds (\ tyvars ->
        tcMonoTypeKind ty               `thenTc` \ (kind, ty') ->
        unifyKind kind mkTcTypeKind     `thenTc_`
        returnTc (mkTcTypeKind, ty')
     )
   where
-    (tyvar_names, kinds) = unzip tyvars_w_kinds
-    tyvars   = zipWithEqual mk_tyvar tyvar_names kinds
+    (names, kinds) = unzip tyvars_w_kinds
     tc_kinds = map kindToTcKind kinds
-    mk_tyvar name kind = mkTyVar (getNameShortName name) (getItsUnique name) kind
 
 -- for unfoldings only:
 tcMonoTypeKind (MonoDictTy class_name ty)
@@ -112,19 +107,28 @@ tcMonoTypeKind (MonoDictTy class_name ty)
     tcLookupClass class_name           `thenNF_Tc` \ (class_kind, clas) ->
     unifyKind class_kind arg_kind      `thenTc_`
     returnTc (mkTcTypeKind, mkDictTy clas arg_ty)
+\end{code}
 
+Help functions for type applications
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+\begin{code}
+tcMonoTyApp fun_kind fun_ty tys
+  = mapAndUnzipTc tcMonoTypeKind tys   `thenTc`    \ (arg_kinds, arg_tys) ->
+    newKindVar                         `thenNF_Tc` \ result_kind ->
+    unifyKind fun_kind (foldr mkTcArrowKind result_kind arg_kinds)     `thenTc_`
+    returnTc (result_kind, foldl mkAppTy fun_ty arg_tys)
 
-tc_mono_name :: Name -> NF_TcM s (TcKind s, Type)
-tc_mono_name name@(Short _ _)          -- Must be a type variable
-  = tcLookupTyVar name                 `thenNF_Tc` \ (kind,tyvar) ->
-    returnNF_Tc (kind, mkTyVarTy tyvar)
+tcSynApp name syn_kind arity tycon tys
+  = mapAndUnzipTc tcMonoTypeKind tys   `thenTc`    \ (arg_kinds, arg_tys) ->
+    newKindVar                         `thenNF_Tc` \ result_kind ->
+    unifyKind syn_kind (foldr mkTcArrowKind result_kind arg_kinds)     `thenTc_`
 
-tc_mono_name name | isTyConName name   -- Must be a type constructor
-  = tcLookupTyCon name                 `thenNF_Tc` \ (kind,tycon) ->
-    returnNF_Tc (kind, mkTyConTy tycon)
-       
-tc_mono_name name                      -- Renamer should have got it right
-  = panic ("tc_mono_name:" ++ ppShow 1000 (ppr PprDebug name))
+       -- Check that it's applied to the right number of arguments
+    checkTc (arity == n_args) (err arity)                              `thenTc_`
+    returnTc (result_kind, mkSynTy tycon arg_tys)
+  where
+    err arity = arityErr "Type synonym constructor" name arity n_args
+    n_args    = length tys
 \end{code}
 
 
@@ -175,18 +179,6 @@ tcPolyType (HsForAllTy tyvar_names context ty)
     )
 \end{code}
 
-Auxilliary functions
-~~~~~~~~~~~~~~~~~~~~
-\begin{code}
-synArityCheck :: Name -> Int -> TcM s ()
-synArityCheck name n_args
-  = case getSynNameArity name of
-       Just arity | arity /= n_args -> failTc (err arity)
-       other                        -> returnTc ()
-  where
-    err arity = arityErr "Type synonym constructor" name arity n_args
-\end{code}
-
 Errors and contexts
 ~~~~~~~~~~~~~~~~~~~
 \begin{code}