summaryrefslogtreecommitdiff
path: root/prelude
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-11-09 11:15:11 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2015-11-09 11:19:25 -0800
commitc1e474f005c99ca3d2210411389970f5da55c422 (patch)
tree726961ab0d78c9aae93ec79bfa34d8691725bedd /prelude
parent23b693c029d17dc9833a81b33ca241f3b6fe6cc7 (diff)
Restored Text.Pandoc.Compat.Monoid.
Don't use custom prelude for latest ghc. This is a better approach to making 'stack ghci' and 'cabal repl' work. Instead of using NoImplicitPrelude, we only use the custom prelude for older ghc versions. The custom prelude presents a uniform API that matches the current base version's prelude. So, when developing (presumably with latest ghc), we don't use a custom prelude at all and hence have no trouble with ghci. The custom prelude no longer exports (<>): we now want to match the base 4.8 prelude behavior.
Diffstat (limited to 'prelude')
-rw-r--r--prelude/Prelude.hs19
1 files changed, 5 insertions, 14 deletions
diff --git a/prelude/Prelude.hs b/prelude/Prelude.hs
index ca5c687ea..50e86a7b9 100644
--- a/prelude/Prelude.hs
+++ b/prelude/Prelude.hs
@@ -1,23 +1,24 @@
{-# LANGUAGE PackageImports #-}
{-# LANGUAGE CPP #-}
+-- This custom Prelude emulates the API of the prelude
+-- with base 4.8.
+
module Prelude
(
module P
-, Monoid(..)
-, Applicative(..)
#if MIN_VERSION_base(4,8,0)
#else
+, Monoid(..)
+, Applicative(..)
, (<$>)
, (<$)
#endif
-, (<>)
)
where
#if MIN_VERSION_base(4,8,0)
import "base" Prelude as P
-import Data.Monoid ((<>))
#elif MIN_VERSION_base(4,6,0)
import "base" Prelude as P
import Control.Applicative
@@ -27,13 +28,3 @@ import "base" Prelude as P hiding (catch)
import Control.Applicative
import Data.Monoid
#endif
-
-#if MIN_VERSION_base(4,5,0)
-#else
-infixr 6 <>
-
--- | An infix synonym for 'mappend'.
-(<>) :: Monoid m => m -> m -> m
-(<>) = mappend
-{-# INLINE (<>) #-}
-#endif