projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-05-09 13:16:29 by simonmar]
[ghc-base.git]
/
Prelude.hs
diff --git
a/Prelude.hs
b/Prelude.hs
index
8ee9330
..
70eee4d
100644
(file)
--- a/
Prelude.hs
+++ b/
Prelude.hs
@@
-1,16
+1,14
@@
{-# OPTIONS -fno-implicit-prelude #-}
-----------------------------------------------------------------------------
{-# OPTIONS -fno-implicit-prelude #-}
-----------------------------------------------------------------------------
---
+-- |
-- Module : Prelude
-- Copyright : (c) The University of Glasgow 2001
-- Module : Prelude
-- Copyright : (c) The University of Glasgow 2001
--- License : BSD-style (see the file libraries/core/LICENSE)
+-- License : BSD-style (see the file libraries/base/LICENSE)
--
-- Maintainer : libraries@haskell.org
-- Stability : provisional
-- Portability : portable
--
--
-- Maintainer : libraries@haskell.org
-- Stability : provisional
-- Portability : portable
--
--- $Id: Prelude.hs,v 1.1 2001/06/28 14:15:01 simonmar Exp $
---
-- Standard module imported by default into Haskell modules.
--
-----------------------------------------------------------------------------
-- Standard module imported by default into Haskell modules.
--
-----------------------------------------------------------------------------
@@
-57,7
+55,7
@@
module Prelude (
Rational,
[]((:), []),
Rational,
[]((:), []),
- module GHC.Tup,
+ module Data.Tuple,
-- Includes tuple types + fst, snd, curry, uncurry
()(..), -- The unit type
(->), -- functions
-- Includes tuple types + fst, snd, curry, uncurry
()(..), -- The unit type
(->), -- functions
@@
-83,7
+81,7
@@
module Prelude (
(&&), (||), not, otherwise,
subtract, even, odd, gcd, lcm, (^), (^^),
fromIntegral, realToFrac,
(&&), (||), not, otherwise,
subtract, even, odd, gcd, lcm, (^), (^^),
fromIntegral, realToFrac,
- --exported by GHC.Tup: fst, snd, curry, uncurry,
+ --exported by Data.Tuple: fst, snd, curry, uncurry,
id, const, (.), flip, ($), until,
asTypeOf, error, undefined,
seq, ($!)
id, const, (.), flip, ($), until,
asTypeOf, error, undefined,
seq, ($!)
@@
-98,6
+96,7
@@
import Data.List
import Data.Either
import Data.Maybe
import Data.Bool
import Data.Either
import Data.Maybe
import Data.Bool
+import Data.Tuple
#ifdef __GLASGOW_HASKELL__
import GHC.Base
#ifdef __GLASGOW_HASKELL__
import GHC.Base
@@
-108,7
+107,6
@@
import GHC.Enum
import GHC.Num
import GHC.Real
import GHC.Float
import GHC.Num
import GHC.Real
import GHC.Float
-import GHC.Tup
import GHC.Show
import GHC.Conc
import GHC.Err ( error, undefined )
import GHC.Show
import GHC.Conc
import GHC.Err ( error, undefined )