diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2016-03-29 09:57:29 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2016-03-31 08:02:29 +0100 |
| commit | 1f68da14e44144925d1c7dd277523c48224902b8 (patch) | |
| tree | 08daf5b1d467d1313f3e50bdb30496f0ee54441d | |
| parent | 8f66bac9ba4c3ebe6c26b0c72e03b6754782ecbe (diff) | |
| download | haskell-1f68da14e44144925d1c7dd277523c48224902b8.tar.gz | |
Minor refactoring in mkExport
No change in behaviour
| -rw-r--r-- | compiler/typecheck/TcBinds.hs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs index 3d5a401d0f..6ce9aed289 100644 --- a/compiler/typecheck/TcBinds.hs +++ b/compiler/typecheck/TcBinds.hs @@ -675,16 +675,7 @@ mkExport prag_fn qtvs theta , mbi_sig = mb_sig , mbi_mono_id = mono_id }) = do { mono_ty <- zonkTcType (idType mono_id) - ; poly_id <- case mb_sig of - Just sig | Just poly_id <- completeIdSigPolyId_maybe sig - -> return poly_id - _other -> checkNoErrs $ - mkInferredPolyId qtvs theta - poly_name mb_sig mono_ty - -- The checkNoErrs ensures that if the type is ambiguous - -- we don't carry on to the impedence matching, and generate - -- a duplicate ambiguity error. There is a similar - -- checkNoErrs for complete type signatures too. + ; poly_id <- mkInferredPolyId qtvs theta poly_name mb_sig mono_ty -- NB: poly_id has a zonked type ; poly_id <- addInlinePrags poly_id prag_sigs @@ -723,7 +714,16 @@ mkInferredPolyId :: [TyVar] -> TcThetaType -> Name -> Maybe TcIdSigInfo -> TcType -> TcM TcId mkInferredPolyId qtvs inferred_theta poly_name mb_sig mono_ty - = do { fam_envs <- tcGetFamInstEnvs + | Just sig <- mb_sig + , Just poly_id <- completeIdSigPolyId_maybe sig + = return poly_id + + | otherwise -- Either no type sig or partial type sig + = checkNoErrs $ -- The checkNoErrs ensures that if the type is ambiguous + -- we don't carry on to the impedence matching, and generate + -- a duplicate ambiguity error. There is a similar + -- checkNoErrs for complete type signatures too. + do { fam_envs <- tcGetFamInstEnvs ; let (_co, mono_ty') = normaliseType fam_envs Nominal mono_ty -- Unification may not have normalised the type, -- (see Note [Lazy flattening] in TcFlatten) so do it @@ -754,7 +754,8 @@ chooseInferredQuantifiers :: TcThetaType -- inferred -> Maybe TcIdSigInfo -> TcM ([TcTyBinder], TcThetaType) chooseInferredQuantifiers inferred_theta tau_tvs qtvs Nothing - = do { let free_tvs = closeOverKinds (growThetaTyVars inferred_theta tau_tvs) + = -- No type signature for this binder + do { let free_tvs = closeOverKinds (growThetaTyVars inferred_theta tau_tvs) -- Include kind variables! Trac #7916 my_theta = pickQuantifiablePreds free_tvs inferred_theta binders = [ mkNamedBinder Invisible tv @@ -805,7 +806,8 @@ chooseInferredQuantifiers inferred_theta tau_tvs qtvs ; return (mk_binders free_tvs, final_theta) } - | otherwise = pprPanic "chooseInferredQuantifiers" (ppr bndr_info) + | otherwise -- A complete type signature is dealt with in mkInferredPolyId + = pprPanic "chooseInferredQuantifiers" (ppr bndr_info) where pts_hint = text "To use the inferred type, enable PartialTypeSignatures" |