summaryrefslogtreecommitdiff
path: root/compiler/basicTypes
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2019-12-19 11:50:10 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-12-20 10:50:57 -0500
commit70e56b272492b65e41a149ec39a939e794fea66b (patch)
treea030c730bed2d539433ebdf16609aa88439c83fe /compiler/basicTypes
parent1a0d1a6583cc39a31d6947eda1d4998c4fb53c4f (diff)
downloadhaskell-70e56b272492b65e41a149ec39a939e794fea66b.tar.gz
lookupBindGroupOcc: recommend names in the same namespace (#17593)
Previously, `lookupBindGroupOcc`'s error message would recommend all similar names in scope, regardless of whether they were type constructors, data constructors, or functions, leading to the confusion witnessed in #17593. This is easily fixed by only recommending names in the same namespace, using the `nameSpacesRelated` function. Fixes #17593.
Diffstat (limited to 'compiler/basicTypes')
-rw-r--r--compiler/basicTypes/Name.hs12
1 files changed, 7 insertions, 5 deletions
diff --git a/compiler/basicTypes/Name.hs b/compiler/basicTypes/Name.hs
index b0dfa806e0..2cbd50ed6f 100644
--- a/compiler/basicTypes/Name.hs
+++ b/compiler/basicTypes/Name.hs
@@ -50,7 +50,7 @@ module Name (
-- ** Manipulating and deconstructing 'Name's
nameUnique, setNameUnique,
- nameOccName, nameModule, nameModule_maybe,
+ nameOccName, nameNameSpace, nameModule, nameModule_maybe,
setNameLoc,
tidyNameOcc,
localiseName,
@@ -196,14 +196,16 @@ instance HasOccName Name where
nameUnique :: Name -> Unique
nameOccName :: Name -> OccName
+nameNameSpace :: Name -> NameSpace
nameModule :: HasDebugCallStack => Name -> Module
nameSrcLoc :: Name -> SrcLoc
nameSrcSpan :: Name -> SrcSpan
-nameUnique name = n_uniq name
-nameOccName name = n_occ name
-nameSrcLoc name = srcSpanStart (n_loc name)
-nameSrcSpan name = n_loc name
+nameUnique name = n_uniq name
+nameOccName name = n_occ name
+nameNameSpace name = occNameSpace (n_occ name)
+nameSrcLoc name = srcSpanStart (n_loc name)
+nameSrcSpan name = n_loc name
{-
************************************************************************