diff options
| author | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
|---|---|---|
| committer | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
| commit | 84c2ad99582391005b5e873198b15e9e9eb4f78d (patch) | |
| tree | caa8c2f2ec7e97fbb4977263c6817c9af5025cf4 /compiler/rename/RnUnbound.hs | |
| parent | 8ddb47cfcf5776e9a3c55fd37947c8a95e00fa12 (diff) | |
| parent | e68b439fe5de61b9a2ca51af472185c62ccb8b46 (diff) | |
| download | haskell-wip/T13904.tar.gz | |
update to current master againwip/T13904
Diffstat (limited to 'compiler/rename/RnUnbound.hs')
| -rw-r--r-- | compiler/rename/RnUnbound.hs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/compiler/rename/RnUnbound.hs b/compiler/rename/RnUnbound.hs index cf5dab5d37..ce5d0dc315 100644 --- a/compiler/rename/RnUnbound.hs +++ b/compiler/rename/RnUnbound.hs @@ -12,7 +12,10 @@ module RnUnbound ( mkUnboundName , WhereLooking(..) , unboundName , unboundNameX - , perhapsForallMsg ) where + , perhapsForallMsg + , notInScopeErr ) where + +import GhcPrelude import RdrName import HscTypes @@ -58,8 +61,7 @@ unboundNameX :: WhereLooking -> RdrName -> SDoc -> RnM Name unboundNameX where_look rdr_name extra = do { dflags <- getDynFlags ; let show_helpful_errors = gopt Opt_HelpfulErrors dflags - what = pprNonVarNameSpace (occNameSpace (rdrNameOcc rdr_name)) - err = unknownNameErr what rdr_name $$ extra + err = notInScopeErr rdr_name $$ extra ; if not show_helpful_errors then addErr err else do { local_env <- getLocalRdrEnv @@ -70,12 +72,13 @@ unboundNameX where_look rdr_name extra ; addErr (err $$ suggestions) } ; return (mkUnboundNameRdr rdr_name) } -unknownNameErr :: SDoc -> RdrName -> SDoc -unknownNameErr what rdr_name +notInScopeErr :: RdrName -> SDoc +notInScopeErr rdr_name = vcat [ hang (text "Not in scope:") 2 (what <+> quotes (ppr rdr_name)) , extra ] where + what = pprNonVarNameSpace (occNameSpace (rdrNameOcc rdr_name)) extra | rdr_name == forall_tv_RDR = perhapsForallMsg | otherwise = Outputable.empty |