[Git][ghc/ghc][wip/T25647] some renaming

[Patrick (@soulomoon)]

Patrick pushed to branch wip/T25647 at Glasgow Haskell Compiler / GHC


Commits:
214aa94c by Patrick at 2025-03-12T04:44:16+08:00
some renaming

- - - - -


4 changed files:

- compiler/GHC/Rename/Module.hs
- compiler/GHC/Tc/Gen/HsType.hs
- compiler/GHC/Tc/TyCl.hs
- compiler/GHC/Tc/TyCl/Instance.hs


Changes:

=====================================
compiler/GHC/Rename/Module.hs
=====================================
@@ -717,7 +717,7 @@ rnFamEqn doc atfi
 
              groups :: [NonEmpty (LocatedN RdrName)]
              groups = equivClasses cmpLocated pat_kity_vars
-       ; traceRn "rnFamEqn: rn_outer_bndrs: " (ppr outer_bndrs <+> ppr rn_outer_bndrs')
+       ; traceRn "rnFamEqn: rn_outer_bndrs: " (ppr rn_outer_bndrs')
        ; nms_dups <- mapM (lookupOccRn . unLoc) $
                         [ tv | (tv :| (_:_)) <- groups ]
              -- Add to the used variables


=====================================
compiler/GHC/Tc/Gen/HsType.hs
=====================================
@@ -72,7 +72,7 @@ module GHC.Tc.Gen.HsType (
         HoleMode(..),
 
         -- Utils
-        tyLitFromLit, tyLitFromOverloadedLit, expliciteOuterTyVars, impliciteOuterTyVars,
+        tyLitFromLit, tyLitFromOverloadedLit, explicitOuterTyVars, implicitOuterTyVars,
 
    ) where
 
@@ -3281,16 +3281,16 @@ outerTyVars :: HsOuterTyVarBndrs flag GhcTc -> [TcTyVar]
 outerTyVars (HsOuterImplicit { hso_ximplicit = tvs })  = tvs
 outerTyVars (HsOuterExplicit { hso_xexplicit = tvbs }) = binderVars tvbs
 
-expliciteOuterTyVars :: HsOuterTyVarBndrs flag GhcTc -> [TcTyVar]
+explicitOuterTyVars :: HsOuterTyVarBndrs flag GhcTc -> [TcTyVar]
 -- The returned [TcTyVar] is not necessarily in dependency order
 -- at least for the HsOuterImplicit case
-expliciteOuterTyVars (HsOuterImplicit {})  = []
-expliciteOuterTyVars (HsOuterExplicit { hso_xexplicit = tvbs }) = binderVars tvbs
+explicitOuterTyVars (HsOuterImplicit {})  = []
+explicitOuterTyVars (HsOuterExplicit { hso_xexplicit = tvbs }) = binderVars tvbs
 
-impliciteOuterTyVars :: HsOuterTyVarBndrs flag GhcTc -> [TcTyVar]
+implicitOuterTyVars :: HsOuterTyVarBndrs flag GhcTc -> [TcTyVar]
 -- The returned [TcTyVar] is not necessarily in dependency order
-impliciteOuterTyVars (HsOuterImplicit { hso_ximplicit = tvs })  = tvs
-impliciteOuterTyVars (HsOuterExplicit {}) = []
+implicitOuterTyVars (HsOuterImplicit { hso_ximplicit = tvs })  = tvs
+implicitOuterTyVars (HsOuterExplicit {}) = []
 
 
 


=====================================
compiler/GHC/Tc/TyCl.hs
=====================================
@@ -21,7 +21,7 @@ module GHC.Tc.TyCl (
         tcFamTyPats, tcTyFamInstEqn,
         tcAddOpenTyFamInstCtxt, tcMkDataFamInstCtxt, tcAddDataFamInstCtxt,
         unravelFamInstPats, addConsistencyConstraints,
-        checkFamTelescope, tcFamInsLHSBinders
+        checkFamTelescope, tcFamInstLHSBinders
     ) where
 
 import GHC.Prelude
@@ -249,10 +249,10 @@ tcTyClGroup (TyClGroup { group_tyclds = tyclds
                  th_bndrs' `plusNameEnv` th_bndrs) }
 
 
--- tcFamInsLHSBinders :: FamEqn TyVar Name -> TcM [TyVar]
-tcFamInsLHSBinders :: TcLevel -> SkolemInfo -> HsOuterFamEqnTyVarBndrs GhcTc -> HsOuterFamEqnTyVarBndrs GhcRn
+-- tcFamInstLHSBinders :: FamEqn TyVar Name -> TcM [TyVar]
+tcFamInstLHSBinders :: TcLevel -> SkolemInfo -> HsOuterFamEqnTyVarBndrs GhcTc -> HsOuterFamEqnTyVarBndrs GhcRn
   -> [TcTyVar] -> Type -> WantedConstraints -> IOEnv (Env TcGblEnv TcLclEnv) ([TyCoVar], [TcTyVar])
-tcFamInsLHSBinders tclvl skol_info outer_bndrs hs_outer_bndrs wcs lhs_ty wanted = do
+tcFamInstLHSBinders tclvl skol_info outer_bndrs hs_outer_bndrs wcs lhs_ty wanted = do
        -- This code (and the stuff immediately above) is very similar
        -- to that in tcTyFamInstEqnGuts.  Maybe we should abstract the
        -- common code; but for the moment I concluded that it's
@@ -260,8 +260,8 @@ tcFamInsLHSBinders tclvl skol_info outer_bndrs hs_outer_bndrs wcs lhs_ty wanted
        -- check there too!
 
        -- See Note [Type variables in type families instance decl]
-       ; let outer_exp_tvs = scopedSort $ expliciteOuterTyVars outer_bndrs
-       ; let outer_imp_tvs = impliciteOuterTyVars outer_bndrs
+       ; let outer_exp_tvs = scopedSort $ explicitOuterTyVars outer_bndrs
+       ; let outer_imp_tvs = implicitOuterTyVars outer_bndrs
        ; checkFamTelescope tclvl hs_outer_bndrs outer_exp_tvs
        ; outer_imp_wc_tvs <- liftZonkM $ zonkTcTyVarsToTcTyVarsMaybe $ outer_imp_tvs ++ wcs
        -- See GHC.Tc.TyCl Note [Generalising in tcTyFamInstEqnGuts]
@@ -274,7 +274,7 @@ tcFamInsLHSBinders tclvl skol_info outer_bndrs hs_outer_bndrs wcs lhs_ty wanted
 
        ; let final_tvs = scopedSort (qtvs ++ outer_exp_tvs)
 
-       ; traceTc "tcFamInsLHSBinders" $
+       ; traceTc "tcFamInstLHSBinders" $
          vcat [
           -- ppr fam_tc
               text "lhs_ty:"    <+> ppr lhs_ty
@@ -3485,7 +3485,7 @@ tcTyFamInstEqnGuts fam_tc mb_clsinfo outer_hs_bndrs hs_pats hs_rhs_ty
        ; traceTc "tcTyFamInstEqnGuts 0" (ppr outer_bndrs $$ ppr skol_info)
 
       --  -- See Note [Type variables in type families instance decl]
-       ; (final_tvs, qtvs) <- tcFamInsLHSBinders tclvl skol_info outer_bndrs outer_hs_bndrs wcs lhs_ty wanted
+       ; (final_tvs, qtvs) <- tcFamInstLHSBinders tclvl skol_info outer_bndrs outer_hs_bndrs wcs lhs_ty wanted
 
        -- See Note [Error on unconstrained meta-variables] in GHC.Tc.Utils.TcMType
        -- Example: typecheck/should_fail/T17301


=====================================
compiler/GHC/Tc/TyCl/Instance.hs
=====================================
@@ -1017,7 +1017,7 @@ tcDataFamInstHeader mb_clsinfo skol_info fam_tc hs_outer_bndrs fixity
                            , lhs_applied_kind
                            , res_kind ) }
 
-       ; (final_tvs, qtvs) <- tcFamInsLHSBinders tclvl skol_info outer_bndrs hs_outer_bndrs wcs lhs_ty wanted
+       ; (final_tvs, qtvs) <- tcFamInstLHSBinders tclvl skol_info outer_bndrs hs_outer_bndrs wcs lhs_ty wanted
 
        ; (final_tvs, non_user_tvs, lhs_ty, master_res_kind, instance_res_kind, stupid_theta) <-
           liftZonkM $ do



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/214aa94c6a723c926f581ed4157724f70daed1d0

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/214aa94c6a723c926f581ed4157724f70daed1d0
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250311/1b28655f/attachment-0001.html>