Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics1
http://hackage.haskell.org/trac/ghc/changeset/4ace93463541ec81179b7b41ea5085f90f0a9893 >--------------------------------------------------------------- commit 4ace93463541ec81179b7b41ea5085f90f0a9893 Author: Jose Pedro Magalhaes <[email protected]> Date: Thu May 17 17:09:11 2012 +0100 Revert "Move Functor from base to ghc-prim" This reverts commit 04e74dadaa1191553c99062452dcc2c46e0f6821. >--------------------------------------------------------------- compiler/prelude/PrelNames.lhs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index 021f753..110889a 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -668,7 +668,7 @@ notAssocDataCon_RDR = dataQual_RDR gHC_GENERICS (fsLit "NotAssociative") fmap_RDR, pure_RDR, ap_RDR, foldable_foldr_RDR, traverse_RDR :: RdrName -fmap_RDR = varQual_RDR gHC_CLASSES (fsLit "fmap") +fmap_RDR = varQual_RDR gHC_BASE (fsLit "fmap") pure_RDR = varQual_RDR cONTROL_APPLICATIVE (fsLit "pure") ap_RDR = varQual_RDR cONTROL_APPLICATIVE (fsLit "<*>") foldable_foldr_RDR = varQual_RDR dATA_FOLDABLE (fsLit "foldr") @@ -773,8 +773,8 @@ eqClassName = clsQual gHC_CLASSES (fsLit "Eq") eqClassKey eqName = methName gHC_CLASSES (fsLit "==") eqClassOpKey ordClassName = clsQual gHC_CLASSES (fsLit "Ord") ordClassKey geName = methName gHC_CLASSES (fsLit ">=") geClassOpKey -functorClassName = clsQual gHC_CLASSES (fsLit "Functor") functorClassKey -fmapName = methName gHC_CLASSES (fsLit "fmap") fmapClassOpKey +functorClassName = clsQual gHC_BASE (fsLit "Functor") functorClassKey +fmapName = methName gHC_BASE (fsLit "fmap") fmapClassOpKey -- Class Monad monadClassName, thenMName, bindMName, returnMName, failMName :: Name _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
