summaryrefslogtreecommitdiff
path: root/compiler/GHC/Rename
diff options
context:
space:
mode:
authorTakenobu Tani <takenobu.hs@gmail.com>2020-05-30 23:11:59 +0900
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-06-10 03:39:59 -0400
commit2487912938f188cb264e4a11d21bf750adccc5e7 (patch)
tree13843cfd8f27bf6f1672a4e37d6af0e04bb34d18 /compiler/GHC/Rename
parenta47e6442bc4be4a33339499d876792ba109e8d32 (diff)
downloadhaskell-2487912938f188cb264e4a11d21bf750adccc5e7.tar.gz
Clarify leaf module names for new module hierarchy
This updates comments only. This patch replaces leaf module names according to new module hierarchy [1][2] as followings: * Expand leaf names to easily find the module path: for instance, `Id.hs` to `GHC.Types.Id`. * Modify leaf names according to new module hierarchy: for instance, `Convert.hs` to `GHC.ThToHs`. * Fix typo: for instance, `GHC.Core.TyCo.Rep.hs` to `GHC.Core.TyCo.Rep` See also !3375 [1]: https://gitlab.haskell.org/ghc/ghc/-/wikis/Make-GHC-codebase-more-modular [2]: https://gitlab.haskell.org/ghc/ghc/issues/13009
Diffstat (limited to 'compiler/GHC/Rename')
-rw-r--r--compiler/GHC/Rename/Env.hs2
-rw-r--r--compiler/GHC/Rename/HsType.hs4
-rw-r--r--compiler/GHC/Rename/Names.hs4
-rw-r--r--compiler/GHC/Rename/Utils.hs8
4 files changed, 9 insertions, 9 deletions
diff --git a/compiler/GHC/Rename/Env.hs b/compiler/GHC/Rename/Env.hs
index 89d1e66311..7ef776cc99 100644
--- a/compiler/GHC/Rename/Env.hs
+++ b/compiler/GHC/Rename/Env.hs
@@ -167,7 +167,7 @@ newTopSrcBinder (L loc rdr_name)
; unless (this_mod == nameModule name)
(addErrAt loc (badOrigBinding rdr_name))
; return name }
- else -- See Note [Binders in Template Haskell] in Convert.hs
+ else -- See Note [Binders in Template Haskell] in "GHC.ThToHs"
do { this_mod <- getModule
; externaliseName this_mod name }
diff --git a/compiler/GHC/Rename/HsType.hs b/compiler/GHC/Rename/HsType.hs
index a13b15fe5d..df6a0f47a8 100644
--- a/compiler/GHC/Rename/HsType.hs
+++ b/compiler/GHC/Rename/HsType.hs
@@ -277,7 +277,7 @@ extraConstraintWildCardsAllowed env
TypeSigCtx {} -> True
ExprWithTySigCtx {} -> True
DerivDeclCtx {} -> True
- StandaloneKindSigCtx {} -> False -- See Note [Wildcards in standalone kind signatures] in GHC/Hs/Decls
+ StandaloneKindSigCtx {} -> False -- See Note [Wildcards in standalone kind signatures] in "GHC.Hs.Decls"
_ -> False
-- | When the NamedWildCards extension is enabled, partition_nwcs
@@ -812,7 +812,7 @@ wildCardsAllowed env
FamPatCtx {} -> True -- Not named wildcards though
GHCiCtx {} -> True
HsTypeCtx {} -> True
- StandaloneKindSigCtx {} -> False -- See Note [Wildcards in standalone kind signatures] in GHC/Hs/Decls
+ StandaloneKindSigCtx {} -> False -- See Note [Wildcards in standalone kind signatures] in "GHC.Hs.Decls"
_ -> False
diff --git a/compiler/GHC/Rename/Names.hs b/compiler/GHC/Rename/Names.hs
index 354954f19c..ccc72bac36 100644
--- a/compiler/GHC/Rename/Names.hs
+++ b/compiler/GHC/Rename/Names.hs
@@ -836,8 +836,8 @@ newRecordSelector overload_ok (dc:_) (L loc (FieldOcc _ (L _ fld)))
-- of an already renamer-resolved field and its use
-- sites. This is needed to correctly support record
-- selectors in Template Haskell. See Note [Binders in
- -- Template Haskell] in Convert.hs and Note [Looking up
- -- Exact RdrNames] in GHC.Rename.Env.
+ -- Template Haskell] in "GHC.ThToHs" and Note [Looking up
+ -- Exact RdrNames] in "GHC.Rename.Env".
| otherwise = mkRdrUnqual (flSelector qualFieldLbl)
{-
diff --git a/compiler/GHC/Rename/Utils.hs b/compiler/GHC/Rename/Utils.hs
index f7ab9496f5..f76939493f 100644
--- a/compiler/GHC/Rename/Utils.hs
+++ b/compiler/GHC/Rename/Utils.hs
@@ -71,7 +71,7 @@ newLocalBndrRn :: Located RdrName -> RnM Name
newLocalBndrRn (L loc rdr_name)
| Just name <- isExact_maybe rdr_name
= return name -- This happens in code generated by Template Haskell
- -- See Note [Binders in Template Haskell] in Convert.hs
+ -- See Note [Binders in Template Haskell] in "GHC.ThToHs"
| otherwise
= do { unless (isUnqual rdr_name)
(addErrAt loc (badQualBndrErr rdr_name))
@@ -113,7 +113,7 @@ checkDupRdrNames rdr_names_w_loc
checkDupNames :: [Name] -> RnM ()
-- Check for duplicated names in a binding group
checkDupNames names = check_dup_names (filterOut isSystemName names)
- -- See Note [Binders in Template Haskell] in Convert
+ -- See Note [Binders in Template Haskell] in "GHC.ThToHs"
check_dup_names :: [Name] -> RnM ()
check_dup_names names
@@ -128,7 +128,7 @@ checkShadowedRdrNames loc_rdr_names
; checkShadowedOccs envs get_loc_occ filtered_rdrs }
where
filtered_rdrs = filterOut (isExact . unLoc) loc_rdr_names
- -- See Note [Binders in Template Haskell] in Convert
+ -- See Note [Binders in Template Haskell] in "GHC.ThToHs"
get_loc_occ (L loc rdr) = (loc,rdrNameOcc rdr)
checkDupAndShadowedNames :: (GlobalRdrEnv, LocalRdrEnv) -> [Name] -> RnM ()
@@ -137,7 +137,7 @@ checkDupAndShadowedNames envs names
; checkShadowedOccs envs get_loc_occ filtered_names }
where
filtered_names = filterOut isSystemName names
- -- See Note [Binders in Template Haskell] in Convert
+ -- See Note [Binders in Template Haskell] in "GHC.ThToHs"
get_loc_occ name = (nameSrcSpan name, nameOccName name)
-------------------------------------