X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Numeric.hs;h=4b202d0efd67d0705eceaaba1f45dde6eeb5caf6;hb=7dbb606d7b57cdad87a0ffbdb6ea4a274ebca7c0;hp=e24803e9e4dec6b3e24ab752b159e295faca7fe0;hpb=aaf764b3ad8b1816d68b5f27299eac125f08e1a5;p=ghc-base.git

diff --git a/Numeric.hs b/Numeric.hs
index e24803e..4b202d0 100644
--- a/Numeric.hs
+++ b/Numeric.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fno-implicit-prelude #-}
+{-# LANGUAGE CPP, NoImplicitPrelude, MagicHash #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Numeric
@@ -16,45 +17,45 @@
 
 module Numeric (
 
-	-- * Showing
+        -- * Showing
 
-	showSigned,       -- :: (Real a) => (a -> ShowS) -> Int -> a -> ShowS
+        showSigned,       -- :: (Real a) => (a -> ShowS) -> Int -> a -> ShowS
 
         showIntAtBase,    -- :: Integral a => a -> (a -> Char) -> a -> ShowS
-	showInt,          -- :: Integral a => a -> ShowS
+        showInt,          -- :: Integral a => a -> ShowS
         showHex,          -- :: Integral a => a -> ShowS
         showOct,          -- :: Integral a => a -> ShowS
 
-	showEFloat,       -- :: (RealFloat a) => Maybe Int -> a -> ShowS
-	showFFloat,       -- :: (RealFloat a) => Maybe Int -> a -> ShowS
-	showGFloat,       -- :: (RealFloat a) => Maybe Int -> a -> ShowS
-	showFloat,        -- :: (RealFloat a) => a -> ShowS
+        showEFloat,       -- :: (RealFloat a) => Maybe Int -> a -> ShowS
+        showFFloat,       -- :: (RealFloat a) => Maybe Int -> a -> ShowS
+        showGFloat,       -- :: (RealFloat a) => Maybe Int -> a -> ShowS
+        showFloat,        -- :: (RealFloat a) => a -> ShowS
+
+        floatToDigits,    -- :: (RealFloat a) => Integer -> a -> ([Int], Int)
 
-	floatToDigits,    -- :: (RealFloat a) => Integer -> a -> ([Int], Int)
+        -- * Reading
 
-	-- * Reading
+        -- | /NB:/ 'readInt' is the \'dual\' of 'showIntAtBase',
+        -- and 'readDec' is the \`dual\' of 'showInt'.
+        -- The inconsistent naming is a historical accident.
 
-	-- | /NB:/ 'readInt' is the \'dual\' of 'showIntAtBase',
-	-- and 'readDec' is the \`dual\' of 'showInt'.
-	-- The inconsistent naming is a historical accident.
+        readSigned,       -- :: (Real a) => ReadS a -> ReadS a
 
-	readSigned,       -- :: (Real a) => ReadS a -> ReadS a
+        readInt,          -- :: (Integral a) => a -> (Char -> Bool)
+                          --         -> (Char -> Int) -> ReadS a
+        readDec,          -- :: (Integral a) => ReadS a
+        readOct,          -- :: (Integral a) => ReadS a
+        readHex,          -- :: (Integral a) => ReadS a
 
-	readInt,          -- :: (Integral a) => a -> (Char -> Bool)
-			  --         -> (Char -> Int) -> ReadS a
-	readDec,          -- :: (Integral a) => ReadS a
-	readOct,          -- :: (Integral a) => ReadS a
-	readHex,          -- :: (Integral a) => ReadS a
+        readFloat,        -- :: (RealFloat a) => ReadS a
 
-	readFloat,        -- :: (RealFloat a) => ReadS a
-	
-	lexDigits,        -- :: ReadS String
+        lexDigits,        -- :: ReadS String
 
-	-- * Miscellaneous
+        -- * Miscellaneous
 
         fromRat,          -- :: (RealFloat a) => Rational -> a
 
-	) where
+        ) where
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base
@@ -81,9 +82,9 @@ import Hugs.Numeric
 
 -- | Reads an /unsigned/ 'Integral' value in an arbitrary base.
 readInt :: Num a
-  => a			-- ^ the base
-  -> (Char -> Bool)	-- ^ a predicate distinguishing valid digits in this base
-  -> (Char -> Int)	-- ^ a function converting a valid digit character to an 'Int'
+  => a                  -- ^ the base
+  -> (Char -> Bool)     -- ^ a predicate distinguishing valid digits in this base
+  -> (Char -> Int)      -- ^ a function converting a valid digit character to an 'Int'
   -> ReadS a
 readInt base isDigit valDigit = readP_to_S (L.readIntP base isDigit valDigit)
 
@@ -111,7 +112,7 @@ readFloatP =
      case tok of
        L.Rat y  -> return (fromRational y)
        L.Int i  -> return (fromInteger i)
-       other    -> pfail
+       _        -> pfail
 
 -- It's turgid to have readSigned work using list comprehensions,
 -- but it's specified as a ReadS to ReadS transformer
@@ -120,24 +121,24 @@ readFloatP =
 -- | Reads a /signed/ 'Real' value, given a reader for an unsigned value.
 readSigned :: (Real a) => ReadS a -> ReadS a
 readSigned readPos = readParen False read'
-		     where read' r  = read'' r ++
-				      (do
-				        ("-",s) <- lex r
-					(x,t)   <- read'' s
-					return (-x,t))
-			   read'' r = do
-			       (str,s) <- lex r
-		      	       (n,"")  <- readPos str
-			       return (n,s)
+                     where read' r  = read'' r ++
+                                      (do
+                                        ("-",s) <- lex r
+                                        (x,t)   <- read'' s
+                                        return (-x,t))
+                           read'' r = do
+                               (str,s) <- lex r
+                               (n,"")  <- readPos str
+                               return (n,s)
 
 -- -----------------------------------------------------------------------------
 -- Showing
 
 -- | Show /non-negative/ 'Integral' numbers in base 10.
 showInt :: Integral a => a -> ShowS
-showInt n cs
-    | n < 0     = error "Numeric.showInt: can't show negative numbers"
-    | otherwise = go n cs
+showInt n0 cs0
+    | n0 < 0    = error "Numeric.showInt: can't show negative numbers"
+    | otherwise = go n0 cs0
     where
     go n cs
         | n < 10    = case unsafeChr (ord '0' + fromIntegral n) of
@@ -152,14 +153,14 @@ showInt n cs
 -- mutual module deps.
 
 {-# SPECIALIZE showEFloat ::
-	Maybe Int -> Float  -> ShowS,
-	Maybe Int -> Double -> ShowS #-}
+        Maybe Int -> Float  -> ShowS,
+        Maybe Int -> Double -> ShowS #-}
 {-# SPECIALIZE showFFloat ::
-	Maybe Int -> Float  -> ShowS,
-	Maybe Int -> Double -> ShowS #-}
+        Maybe Int -> Float  -> ShowS,
+        Maybe Int -> Double -> ShowS #-}
 {-# SPECIALIZE showGFloat ::
-	Maybe Int -> Float  -> ShowS,
-	Maybe Int -> Double -> ShowS #-}
+        Maybe Int -> Float  -> ShowS,
+        Maybe Int -> Double -> ShowS #-}
 
 -- | Show a signed 'RealFloat' value
 -- using scientific (exponential) notation (e.g. @2.45e2@, @1.5e-3@).
@@ -197,17 +198,17 @@ showGFloat d x =  showString (formatRealFloat FFGeneric d x)
 -- | Shows a /non-negative/ 'Integral' number using the base specified by the
 -- first argument, and the character representation specified by the second.
 showIntAtBase :: Integral a => a -> (Int -> Char) -> a -> ShowS
-showIntAtBase base toChr n r
+showIntAtBase base toChr n0 r0
   | base <= 1 = error ("Numeric.showIntAtBase: applied to unsupported base " ++ show base)
-  | n <  0    = error ("Numeric.showIntAtBase: applied to negative number " ++ show n)
-  | otherwise = showIt (quotRem n base) r
+  | n0 <  0   = error ("Numeric.showIntAtBase: applied to negative number " ++ show n0)
+  | otherwise = showIt (quotRem n0 base) r0
    where
     showIt (n,d) r = seq c $ -- stricter than necessary
       case n of
         0 -> r'
-	_ -> showIt (quotRem n base) r'
+        _ -> showIt (quotRem n base) r'
      where
-      c  = toChr (fromIntegral d) 
+      c  = toChr (fromIntegral d)
       r' = c : r
 
 -- | Show /non-negative/ 'Integral' numbers in base 16.