github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-24 07:25:44 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Don’t specialize null for Exports."

Browse Source 
This reverts commit 8f626b6c0f90af595f510543b15400219e5d9102.
This commit is contained in:
Rob Rix 2018-05-07 14:13:11 -04:00
parent 676f905468
commit 05999e7559
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Control/Abstract/ModuleTable.hs
View File

@ -117,7 +117,7 @@ load name = askModuleTable >>= maybeM notFound . ModuleTable.lookup name >>= run
-- languages. We need better semantics rather than doing it ad-hoc. -- languages. We need better semantics rather than doing it ad-hoc.
filterEnv :: Exports.Exports l a -> Environment l a -> Environment l a filterEnv :: Exports.Exports l a -> Environment l a -> Environment l a
filterEnv ports env filterEnv ports env
| null ports = env | Exports.null ports = env
| otherwise = Exports.toEnvironment ports `mergeEnvs` overwrite (Exports.aliases ports) env | otherwise = Exports.toEnvironment ports `mergeEnvs` overwrite (Exports.aliases ports) env
newtype Merging m location value = Merging { runMerging :: m (Maybe (Environment location value, value)) } newtype Merging m location value = Merging { runMerging :: m (Maybe (Environment location value, value)) }

4
src/Data/Abstract/Exports.hs
View File

@ -3,6 +3,7 @@ module Data.Abstract.Exports
( Exports ( Exports
, aliases , aliases
, insert , insert
, null
, toEnvironment , toEnvironment
) where ) where
@ -18,6 +19,9 @@ import Data.Semilattice.Lower
newtype Exports l a = Exports { unExports :: Map.Map Name (Name, Maybe (Address l a)) } newtype Exports l a = Exports { unExports :: Map.Map Name (Name, Maybe (Address l a)) }
deriving (Eq, Foldable, Functor, Generic1, Lower, Monoid, Ord, Semigroup, Show, Traversable) deriving (Eq, Foldable, Functor, Generic1, Lower, Monoid, Ord, Semigroup, Show, Traversable)
null :: Exports l a -> Bool
null = Map.null . unExports
toEnvironment :: Exports l a -> Environment l a toEnvironment :: Exports l a -> Environment l a
toEnvironment exports = unpairs (mapMaybe collectExport (toList (unExports exports))) toEnvironment exports = unpairs (mapMaybe collectExport (toList (unExports exports)))
where where