git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1587 from purescript/1578

Fix #1578

commit3295c372d3d221a4c9b99ce408b8197b9cf38d0c authorPhil Freeman <paf31@cantab.net> dateThu 29 Oct 2015, 08:59 (11 years ago) parent61a97b5893379f
1 file changed+6−2
src/Language/PureScript/Sugar/Names.hs+6−2
src/Language/PureScript/Sugar/Names.hs+6−2
@@ -22,11 +22,12 @@ import Data.List (find, nub)
2222import Data.Maybe (fromMaybe, mapMaybe)
2323
2424#if __GLASGOW_HASKELL__ < 710
25+import Data.Monoid (mempty)
2526import Control.Applicative (Applicative(..), (<$>), (<*>))
2627#endif
2728import Control.Monad
2829import Control.Monad.Error.Class (MonadError(..))
29−import Control.Monad.Writer (MonadWriter(..))
30+import Control.Monad.Writer (MonadWriter(..), censor)
3031
3132import qualified Data.Map as M
3233
@@ -47,10 +48,13 @@ import Language.PureScript.Sugar.Names.Exports
4748--
4849desugarImports :: forall m. (Applicative m, MonadError MultipleErrors m, MonadWriter MultipleErrors m) => [ExternsFile] -> [Module] -> m [Module]
4950desugarImports externs modules = do
50− env <- foldM externsEnv primEnv externs
51+ env <- silence $ foldM externsEnv primEnv externs
5152 env' <- foldM updateEnv env modules
5253 mapM (renameInModule' env') modules
5354 where
55+ silence :: m a -> m a
56+ silence = censor (const mempty)
57+
5458 -- | Create an environment from a collection of externs files
5559 externsEnv :: Env -> ExternsFile -> m Env
5660 externsEnv env ExternsFile{..} = do