From 467bd515da15a58b0668c2912bbd19a81a203659 Mon Sep 17 00:00:00 2001 From: qrczak Date: Sat, 14 Apr 2001 22:28:22 +0000 Subject: [PATCH] [project @ 2001-04-14 22:28:22 by qrczak] Cosmetics. --- ghc/lib/std/PrelBase.lhs | 4 ++-- ghc/lib/std/PrelInt.lhs | 1 - ghc/lib/std/PrelList.lhs | 4 ++-- ghc/lib/std/PrelNum.lhs | 12 ++++++------ ghc/lib/std/PrelStorable.lhs | 3 +-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ghc/lib/std/PrelBase.lhs b/ghc/lib/std/PrelBase.lhs index fde9554..16264ed 100644 --- a/ghc/lib/std/PrelBase.lhs +++ b/ghc/lib/std/PrelBase.lhs @@ -1,5 +1,5 @@ % ----------------------------------------------------------------------------- -% $Id: PrelBase.lhs,v 1.44 2001/04/03 15:05:52 simonmar Exp $ +% $Id: PrelBase.lhs,v 1.45 2001/04/14 22:28:22 qrczak Exp $ % % (c) The University of Glasgow, 1992-2000 % @@ -632,7 +632,7 @@ gtInt, geInt, eqInt, neInt, ltInt, leInt :: Int -> Int -> Bool #if WORD_SIZE_IN_BYTES == 4 {-# RULES -"intToInt32#" forall x#. intToInt32# x# = x# +"intToInt32#" forall x#. intToInt32# x# = x# "wordToWord32#" forall x#. wordToWord32# x# = x# #-} #endif diff --git a/ghc/lib/std/PrelInt.lhs b/ghc/lib/std/PrelInt.lhs index c1ea194..c7ecd75 100644 --- a/ghc/lib/std/PrelInt.lhs +++ b/ghc/lib/std/PrelInt.lhs @@ -466,7 +466,6 @@ foreign import "stg_remInt64" unsafe remInt64# :: Int64# -> Int64# -> foreign import "stg_intToInt64" unsafe intToInt64# :: Int# -> Int64# foreign import "stg_int64ToInt" unsafe int64ToInt# :: Int64# -> Int# foreign import "stg_wordToWord64" unsafe wordToWord64# :: Word# -> Word64# -foreign import "stg_word64ToWord" unsafe word64ToWord# :: Word64# -> Word# foreign import "stg_int64ToWord64" unsafe int64ToWord64# :: Int64# -> Word64# foreign import "stg_word64ToInt64" unsafe word64ToInt64# :: Word64# -> Int64# foreign import "stg_and64" unsafe and64# :: Word64# -> Word64# -> Word64# diff --git a/ghc/lib/std/PrelList.lhs b/ghc/lib/std/PrelList.lhs index 7453388..0a80c15 100644 --- a/ghc/lib/std/PrelList.lhs +++ b/ghc/lib/std/PrelList.lhs @@ -1,5 +1,5 @@ % ------------------------------------------------------------------------------ -% $Id: PrelList.lhs,v 1.23 2001/02/26 09:29:32 simonpj Exp $ +% $Id: PrelList.lhs,v 1.24 2001/04/14 22:28:22 qrczak Exp $ % % (c) The University of Glasgow, 1994-2000 % @@ -515,7 +515,7 @@ I'm going to leave it though. zip takes two lists and returns a list of corresponding pairs. If one input list is short, excess elements of the longer list are discarded. zip3 takes three lists and returns a list of triples. Zips for larger -tuples are in the List library +tuples are in the List module. \begin{code} ---------------------------------------------- diff --git a/ghc/lib/std/PrelNum.lhs b/ghc/lib/std/PrelNum.lhs index e29b3f3..42ec20b 100644 --- a/ghc/lib/std/PrelNum.lhs +++ b/ghc/lib/std/PrelNum.lhs @@ -1,5 +1,5 @@ % ------------------------------------------------------------------------------ -% $Id: PrelNum.lhs,v 1.38 2001/03/29 13:55:01 simonmar Exp $ +% $Id: PrelNum.lhs,v 1.39 2001/04/14 22:28:22 qrczak Exp $ % % (c) The University of Glasgow, 1994-2000 % @@ -437,11 +437,11 @@ jtos n cs | otherwise = jtos' n cs where jtos' :: Integer -> String -> String - jtos' n cs - | n < 10 = case unsafeChr (ord '0' + fromInteger n) of - c@(C# _) -> c:cs + jtos' n' cs' + | n' < 10 = case unsafeChr (ord '0' + fromInteger n') of + c@(C# _) -> c:cs' | otherwise = case unsafeChr (ord '0' + fromInteger r) of - c@(C# _) -> jtos' q (c:cs) + c@(C# _) -> jtos' q (c:cs') where - (q,r) = n `quotRemInteger` 10 + (q,r) = n' `quotRemInteger` 10 \end{code} diff --git a/ghc/lib/std/PrelStorable.lhs b/ghc/lib/std/PrelStorable.lhs index 7f38256..99b3106 100644 --- a/ghc/lib/std/PrelStorable.lhs +++ b/ghc/lib/std/PrelStorable.lhs @@ -1,5 +1,5 @@ % ----------------------------------------------------------------------------- -% $Id: PrelStorable.lhs,v 1.5 2001/04/13 21:37:43 panne Exp $ +% $Id: PrelStorable.lhs,v 1.6 2001/04/14 22:28:22 qrczak Exp $ % % (c) The FFI task force, 2000 % @@ -24,7 +24,6 @@ module PrelStorable \end{code} \begin{code} -import Char ( chr, ord ) import Monad ( liftM ) #ifdef __GLASGOW_HASKELL__ -- 1.7.10.4