X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Ftypecheck%2FTcTyClsDecls.lhs;h=e5eeac8685bda12451a6fce3e2d144387edff8aa;hb=dfcf88523ec5988fbcaa2cbf812cc5862ad621cf;hp=9e0b6cc6ed14a7a5f01da0a9a853d6d5fa7c60e0;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcTyClsDecls.lhs b/compiler/typecheck/TcTyClsDecls.lhs index 9e0b6cc..e5eeac8 100644 --- a/compiler/typecheck/TcTyClsDecls.lhs +++ b/compiler/typecheck/TcTyClsDecls.lhs @@ -301,7 +301,7 @@ kcTyClDecl decl@(TyData {tcdND = new_or_data, tcdCtxt = ctxt, tcdCons = cons}) details' <- kc_con_details details res' <- case res of ResTyH98 -> return ResTyH98 - ResTyGADT ty -> return . ResTyGADT =<< kcHsSigType ty + ResTyGADT ty -> do { ty' <- kcHsSigType ty; return (ResTyGADT ty') } return (ConDecl name expl ex_tvs' ex_ctxt' details' res') kc_con_details (PrefixCon btys) @@ -323,7 +323,6 @@ kcTyClDecl decl@(TyData {tcdND = new_or_data, tcdCtxt = ctxt, tcdCons = cons}) kcTyClDecl decl@(ClassDecl {tcdCtxt = ctxt, tcdSigs = sigs}) = kcTyClDeclBody decl $ \ tvs' -> do { is_boot <- tcIsHsBoot - ; checkTc (not is_boot) badBootClassDeclErr ; ctxt' <- kcHsContext ctxt ; sigs' <- mappM (wrapLocM kc_sig) sigs ; return (decl {tcdTyVars = tvs', tcdCtxt = ctxt', tcdSigs = sigs'}) } @@ -824,6 +823,4 @@ newtypeFieldErr con_name n_flds emptyConDeclsErr tycon = sep [quotes (ppr tycon) <+> ptext SLIT("has no constructors"), nest 2 $ ptext SLIT("(-fglasgow-exts permits this)")] - -badBootClassDeclErr = ptext SLIT("Illegal class declaration in hs-boot file") \end{code}