diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2013-10-04 18:47:15 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2013-10-04 18:47:15 +0100 |
| commit | 8d829544304f98b441d366e793f3eac69e39801f (patch) | |
| tree | 9887169d45c3b54d2003ebb49e71c8e11c84ece7 | |
| parent | 875575805a99d73deebb2d0b9bf36cc296009dda (diff) | |
| download | haskell-8d829544304f98b441d366e793f3eac69e39801f.tar.gz | |
Comments and white space only
| -rw-r--r-- | compiler/typecheck/TcTyClsDecls.lhs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/compiler/typecheck/TcTyClsDecls.lhs b/compiler/typecheck/TcTyClsDecls.lhs index e9eb5d15b0..c4d24d4188 100644 --- a/compiler/typecheck/TcTyClsDecls.lhs +++ b/compiler/typecheck/TcTyClsDecls.lhs @@ -461,8 +461,12 @@ kcTyClDecl :: TyClDecl Name -> TcM () kcTyClDecl (DataDecl { tcdLName = L _ name, tcdTyVars = hs_tvs, tcdDataDefn = defn }) | HsDataDefn { dd_cons = cons, dd_kindSig = Just _ } <- defn = mapM_ (wrapLocM (kcConDecl name)) cons - -- hs_tvs and td_kindSig already dealt with in getInitialKind - -- Ignore the dd_ctxt; heavily deprecated and inconvenient + -- hs_tvs and dd_kindSig already dealt with in getInitialKind + -- If dd_kindSig is Just, this must be a GADT-style decl, + -- (see invariants of DataDefn declaration) + -- so (a) we don't need to bring the hs_tvs into scope, because the + -- ConDecls bind all their own variables + -- (b) dd_ctxt is not allowed for GADT-style decls, so we can ignore it | HsDataDefn { dd_ctxt = ctxt, dd_cons = cons } <- defn = kcTyClTyVars name hs_tvs $ @@ -703,7 +707,7 @@ tcFamDecl1 parent -- differentiate names. -- See [Zonking inside the knot] in TcHsType ; loc <- getSrcSpanM - ; co_ax_name <- newFamInstAxiomName loc tc_name [] + ; co_ax_name <- newFamInstAxiomName loc tc_name [] -- mkBranchedCoAxiom will fail on an empty list of branches, but -- we'll never look at co_ax in this case @@ -1145,10 +1149,10 @@ tcConDecl new_or_data tc_name rep_tycon tmpl_tvs res_tmpl -- Data types -- ResTyH98: the *existential* type variables only -- ResTyGADT: *all* the quantified type variables -- c.f. the comment on con_qvars in HsDecls - ; tkvs <- case res_ty of + ; tkvs <- case res_ty of ResTyH98 -> quantifyTyVars (mkVarSet tmpl_tvs) (tyVarsOfTypes (ctxt++arg_tys)) ResTyGADT res_ty -> quantifyTyVars emptyVarSet (tyVarsOfTypes (res_ty:ctxt++arg_tys)) - + -- Zonk to Types ; (ze, qtkvs) <- zonkTyBndrsX emptyZonkEnv tkvs ; arg_tys <- zonkTcTypeToTypes ze arg_tys |