From f2eda36747e019fbf2e546f80a24c5e231e12460 Mon Sep 17 00:00:00 2001 From: rrt Date: Thu, 11 May 2000 19:43:08 +0000 Subject: [PATCH] [project @ 2000-05-11 19:43:08 by rrt] Rename From*Bounded functions to boundedFrom* for consistency with numericFrom* --- ghc/lib/std/PrelEnum.lhs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ghc/lib/std/PrelEnum.lhs b/ghc/lib/std/PrelEnum.lhs index f4d37ee..92f9745 100644 --- a/ghc/lib/std/PrelEnum.lhs +++ b/ghc/lib/std/PrelEnum.lhs @@ -10,7 +10,7 @@ Instances of Bounded for various datatypes. module PrelEnum( Bounded(..), Enum(..), - enumFromBounded, enumFromThenBounded, + boundedEnumFrom, boundedEnumFromThen, -- Instances for Bounded and Eum: (), Char, Int @@ -51,11 +51,11 @@ class Enum a where enumFromThenTo x1 x2 y = map toEnum [fromEnum x1, fromEnum x2 .. fromEnum y] -- Default methods for bounded enumerations -enumFromBounded :: (Enum a, Bounded a) => a -> [a] -enumFromBounded n = map toEnum [fromEnum n .. fromEnum (maxBound `asTypeOf` n)] +boundedEnumFrom :: (Enum a, Bounded a) => a -> [a] +boundedEnumFrom n = map toEnum [fromEnum n .. fromEnum (maxBound `asTypeOf` n)] -enumFromThenBounded :: (Enum a, Bounded a) => a -> a -> [a] -enumFromThenBounded n1 n2 +boundedEnumFromThen :: (Enum a, Bounded a) => a -> a -> [a] +boundedEnumFromThen n1 n2 | i_n2 >= i_n1 = map toEnum [i_n1, i_n2 .. fromEnum (maxBound `asTypeOf` n1)] | otherwise = map toEnum [i_n1, i_n2 .. fromEnum (minBound `asTypeOf` n1)] where @@ -130,8 +130,8 @@ instance Enum Bool where fromEnum True = oneInt -- Use defaults for the rest - enumFrom = enumFromBounded - enumFromThen = enumFromThenBounded + enumFrom = boundedEnumFrom + enumFromThen = boundedEnumFromThen \end{code} %********************************************************* @@ -164,8 +164,8 @@ instance Enum Ordering where fromEnum GT = twoInt -- Use defaults for the rest - enumFrom = enumFromBounded - enumFromThen = enumFromThenBounded + enumFrom = boundedEnumFrom + enumFromThen = boundedEnumFromThen \end{code} %********************************************************* -- 1.7.10.4