projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1999-07-14 08:37:57 by simonmar]
[ghc-hetmet.git]
/
ghc
/
lib
/
std
/
PrelList.lhs
diff --git
a/ghc/lib/std/PrelList.lhs
b/ghc/lib/std/PrelList.lhs
index
1d32fd7
..
b1a0b7c
100644
(file)
--- a/
ghc/lib/std/PrelList.lhs
+++ b/
ghc/lib/std/PrelList.lhs
@@
-22,10
+22,16
@@
module PrelList (
maximum, minimum, concatMap,
zip, zip3, zipWith, zipWith3, unzip, unzip3,
maximum, minimum, concatMap,
zip, zip3, zipWith, zipWith3, unzip, unzip3,
+#ifdef USE_REPORT_PRELUDE
+
+#else
+
-- non-standard, but hidden when creating the Prelude
-- export list.
takeUInt_append
-- non-standard, but hidden when creating the Prelude
-- export list.
takeUInt_append
+#endif
+
) where
import {-# SOURCE #-} PrelErr ( error )
) where
import {-# SOURCE #-} PrelErr ( error )
@@
-241,20
+247,20
@@
dropWhile p xs@(x:xs')
take :: Int -> [a] -> [a]
take 0 _ = []
take _ [] = []
take :: Int -> [a] -> [a]
take 0 _ = []
take _ [] = []
-take n (x:xs) | n > 0 = x : take (n-1) xs
+take n (x:xs) | n > 0 = x : take (minusInt n 1) xs
take _ _ = errorNegativeIdx "take"
drop :: Int -> [a] -> [a]
drop 0 xs = xs
drop _ [] = []
take _ _ = errorNegativeIdx "take"
drop :: Int -> [a] -> [a]
drop 0 xs = xs
drop _ [] = []
-drop n (_:xs) | n > 0 = drop (n-1) xs
+drop n (_:xs) | n > 0 = drop (minusInt n 1) xs
drop _ _ = errorNegativeIdx "drop"
splitAt :: Int -> [a] -> ([a],[a])
splitAt 0 xs = ([],xs)
splitAt _ [] = ([],[])
drop _ _ = errorNegativeIdx "drop"
splitAt :: Int -> [a] -> ([a],[a])
splitAt 0 xs = ([],xs)
splitAt _ [] = ([],[])
-splitAt n (x:xs) | n > 0 = (x:xs',xs'') where (xs',xs'') = splitAt (n-1) xs
+splitAt n (x:xs) | n > 0 = (x:xs',xs'') where (xs',xs'') = splitAt (minusInt n 1) xs
splitAt _ _ = errorNegativeIdx "splitAt"
#else /* hack away */
splitAt _ _ = errorNegativeIdx "splitAt"
#else /* hack away */
@@
-429,7
+435,7
@@
concat = foldr (++) []
(!!) :: [a] -> Int -> a
#ifdef USE_REPORT_PRELUDE
(x:_) !! 0 = x
(!!) :: [a] -> Int -> a
#ifdef USE_REPORT_PRELUDE
(x:_) !! 0 = x
-(_:xs) !! n | n > 0 = xs !! (n-1)
+(_:xs) !! n | n > 0 = xs !! (minusInt n 1)
(_:_) !! _ = error "Prelude.(!!): negative index"
[] !! _ = error "Prelude.(!!): index too large"
#else
(_:_) !! _ = error "Prelude.(!!): negative index"
[] !! _ = error "Prelude.(!!): index too large"
#else