diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-09-24 15:56:21 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-09-29 09:44:40 -0400 |
| commit | f66eaefd5d4a3e0c0822dd3678e5e55a7d972a0d (patch) | |
| tree | 672eb26f7d2aae5f06486521ae9afdc3f2d9d7de /compiler/GHC/Types | |
| parent | 2e68d4fa8c2514009db368fbbce213e36bdbcda2 (diff) | |
| download | haskell-f66eaefd5d4a3e0c0822dd3678e5e55a7d972a0d.tar.gz | |
compiler: occEnvElts -> nonDetOccEnvElts
Diffstat (limited to 'compiler/GHC/Types')
| -rw-r--r-- | compiler/GHC/Types/Name/Occurrence.hs | 6 | ||||
| -rw-r--r-- | compiler/GHC/Types/Name/Reader.hs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/GHC/Types/Name/Occurrence.hs b/compiler/GHC/Types/Name/Occurrence.hs index 25f0b5e681..3f886fc549 100644 --- a/compiler/GHC/Types/Name/Occurrence.hs +++ b/compiler/GHC/Types/Name/Occurrence.hs @@ -81,7 +81,7 @@ module GHC.Types.Name.Occurrence ( -- * The 'OccEnv' type OccEnv, emptyOccEnv, unitOccEnv, extendOccEnv, mapOccEnv, lookupOccEnv, mkOccEnv, mkOccEnv_C, extendOccEnvList, elemOccEnv, - occEnvElts, foldOccEnv, plusOccEnv, plusOccEnv_C, extendOccEnv_C, + nonDetOccEnvElts, foldOccEnv, plusOccEnv, plusOccEnv_C, extendOccEnv_C, extendOccEnv_Acc, filterOccEnv, delListFromOccEnv, delFromOccEnv, alterOccEnv, pprOccEnv, @@ -401,7 +401,7 @@ mkOccEnv :: [(OccName,a)] -> OccEnv a mkOccEnv_C :: (a -> a -> a) -> [(OccName,a)] -> OccEnv a elemOccEnv :: OccName -> OccEnv a -> Bool foldOccEnv :: (a -> b -> b) -> b -> OccEnv a -> b -occEnvElts :: OccEnv a -> [a] +nonDetOccEnvElts :: OccEnv a -> [a] extendOccEnv_C :: (a->a->a) -> OccEnv a -> OccName -> a -> OccEnv a extendOccEnv_Acc :: (a->b->b) -> (a->b) -> OccEnv b -> OccName -> a -> OccEnv b plusOccEnv :: OccEnv a -> OccEnv a -> OccEnv a @@ -420,7 +420,7 @@ lookupOccEnv (A x) y = lookupUFM x y mkOccEnv l = A $ listToUFM l elemOccEnv x (A y) = elemUFM x y foldOccEnv a b (A c) = foldUFM a b c -occEnvElts (A x) = nonDetEltsUFM x +nonDetOccEnvElts (A x) = nonDetEltsUFM x plusOccEnv (A x) (A y) = A $ plusUFM x y plusOccEnv_C f (A x) (A y) = A $ plusUFM_C f x y extendOccEnv_C f (A x) y z = A $ addToUFM_C f x y z diff --git a/compiler/GHC/Types/Name/Reader.hs b/compiler/GHC/Types/Name/Reader.hs index b2011f3375..91563a53f8 100644 --- a/compiler/GHC/Types/Name/Reader.hs +++ b/compiler/GHC/Types/Name/Reader.hs @@ -428,7 +428,7 @@ elemLocalRdrEnv rdr_name (LRE { lre_env = env, lre_in_scope = ns }) Orig {} -> False localRdrEnvElts :: LocalRdrEnv -> [Name] -localRdrEnvElts (LRE { lre_env = env }) = occEnvElts env +localRdrEnvElts (LRE { lre_env = env }) = nonDetOccEnvElts env inLocalRdrEnvScope :: Name -> LocalRdrEnv -> Bool -- This is the point of the NameSet @@ -818,7 +818,7 @@ pprGlobalRdrEnv :: Bool -> GlobalRdrEnv -> SDoc pprGlobalRdrEnv locals_only env = vcat [ text "GlobalRdrEnv" <+> ppWhen locals_only (text "(locals only)") <+> lbrace - , nest 2 (vcat [ pp (remove_locals gre_list) | gre_list <- occEnvElts env ] + , nest 2 (vcat [ pp (remove_locals gre_list) | gre_list <- nonDetOccEnvElts env ] <+> rbrace) ] where remove_locals gres | locals_only = filter isLocalGRE gres |