[commit: base] ghc-generics1: Revert "Move Functor from base to ghc-prim" (2d3ee96)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : ghc-generics1

http://hackage.haskell.org/trac/ghc/changeset/2d3ee96336522c2d04775d9cbb89a71d9a18601e

>---------------------------------------------------------------

commit 2d3ee96336522c2d04775d9cbb89a71d9a18601e
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Jun 5 18:49:44 2012 +0100

    Revert "Move Functor from base to ghc-prim"
    
    This reverts commit fdf6be960db739b93dae23a3c0fcf16d64b88626.

>---------------------------------------------------------------

 GHC/Base.lhs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index c40e55d..6a36eb5 100644
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -123,6 +123,7 @@ import GHC.Integer ()
 
 infixr 9  .
 infixr 5  ++
+infixl 4  <$
 infixl 1  >>, >>=
 infixr 0  $
 
@@ -173,7 +174,7 @@ Instances of 'Functor' should satisfy the following laws:
 The instances of 'Functor' for lists, 'Data.Maybe.Maybe' and 'System.IO.IO'
 satisfy these laws.
 -}
-{-
+
 class  Functor f  where
     fmap        :: (a -> b) -> f a -> f b
 
@@ -182,7 +183,7 @@ class  Functor f  where
     -- overridden with a more efficient version.
     (<$)        :: a -> f b -> f a
     (<$)        =  fmap . const
--}
+
 {- | The 'Monad' class defines the basic operations over a /monad/,
 a concept from a branch of mathematics known as /category theory/.
 From the perspective of a Haskell programmer, however, it is best to