diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2021-06-01 13:46:39 +0300 |
|---|---|---|
| committer | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2021-06-10 21:03:57 +0300 |
| commit | eb0b3695154cbc1ab92dc2aefeb4452428c15a57 (patch) | |
| tree | 4f457743fbdb5b5011c5d52311c3a78b4d6e23ac /compiler/GHC/Tc | |
| parent | 3d5cb3352c1e1c20f0d5de427f4edbc765ce06d6 (diff) | |
| download | haskell-wip/hs-token-arrow.tar.gz | |
HsUniToken and HsToken for HsArrow (#19623)wip/hs-token-arrow
Another step towards a simpler design for exact printing.
Updates the haddock submodule.
Diffstat (limited to 'compiler/GHC/Tc')
| -rw-r--r-- | compiler/GHC/Tc/Gen/HsType.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Tc/TyCl.hs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/GHC/Tc/Gen/HsType.hs b/compiler/GHC/Tc/Gen/HsType.hs index 83cfad2a1e..8de1974627 100644 --- a/compiler/GHC/Tc/Gen/HsType.hs +++ b/compiler/GHC/Tc/Gen/HsType.hs @@ -1163,7 +1163,7 @@ tc_hs_type mode (HsFunTy _ mult ty1 ty2) exp_kind tc_hs_type mode (HsOpTy _ ty1 (L _ op) ty2) exp_kind | op `hasKey` funTyConKey - = tc_fun_type mode (HsUnrestrictedArrow NormalSyntax) ty1 ty2 exp_kind + = tc_fun_type mode (HsUnrestrictedArrow noHsUniTok) ty1 ty2 exp_kind --------- Foralls tc_hs_type mode (HsForAllTy { hst_tele = tele, hst_body = ty }) exp_kind diff --git a/compiler/GHC/Tc/TyCl.hs b/compiler/GHC/Tc/TyCl.hs index 1af410fd7b..a025190003 100644 --- a/compiler/GHC/Tc/TyCl.hs +++ b/compiler/GHC/Tc/TyCl.hs @@ -1630,9 +1630,9 @@ kcConH98Args new_or_data res_kind con_args = case con_args of -- Kind-check the types of arguments to a GADT data constructor. kcConGADTArgs :: NewOrData -> Kind -> HsConDeclGADTDetails GhcRn -> TcM () kcConGADTArgs new_or_data res_kind con_args = case con_args of - PrefixConGADT tys -> kcConArgTys new_or_data res_kind tys - RecConGADT (L _ flds) -> kcConArgTys new_or_data res_kind $ - map (hsLinear . cd_fld_type . unLoc) flds + PrefixConGADT tys -> kcConArgTys new_or_data res_kind tys + RecConGADT (L _ flds) _ -> kcConArgTys new_or_data res_kind $ + map (hsLinear . cd_fld_type . unLoc) flds kcConDecls :: NewOrData -> Kind -- The result kind signature @@ -3676,7 +3676,7 @@ tcConGADTArgs :: ContextKind -- expected kind of arguments -> TcM [(Scaled TcType, HsSrcBang)] tcConGADTArgs exp_kind (PrefixConGADT btys) = mapM (tcConArg exp_kind) btys -tcConGADTArgs exp_kind (RecConGADT fields) +tcConGADTArgs exp_kind (RecConGADT fields _) = tcRecConDeclFields exp_kind fields tcConArg :: ContextKind -- expected kind for args; always OpenKind for datatypes, |