summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-09-25 12:31:12 +0200
committerGabor Greif <ggreif@gmail.com>2017-09-26 11:13:14 +0200
commit7446c7f68bd5addd2f2db0d8d5910fb963869c47 (patch)
tree05ecf5d25cdecb2893424cd07b0e7002b32ea2c4 /libraries
parent2f8e6e7f8696213b95e3461224909c3b2ec4f7aa (diff)
downloadhaskell-7446c7f68bd5addd2f2db0d8d5910fb963869c47.tar.gz
A bunch of typofixes
Diffstat (limited to 'libraries')
-rw-r--r--libraries/base/Data/Bits.hs2
-rw-r--r--libraries/base/Data/Data.hs2
-rw-r--r--libraries/base/GHC/Event/PSQ.hs2
-rw-r--r--libraries/base/GHC/Show.hs2
-rw-r--r--libraries/base/cbits/primFloat.c2
-rw-r--r--libraries/integer-simple/GHC/Integer.hs2
-rw-r--r--libraries/integer-simple/GHC/Integer/Simple/Internals.hs2
-rw-r--r--libraries/integer-simple/GHC/Integer/Type.hs2
-rw-r--r--libraries/integer-simple/integer-simple.cabal2
9 files changed, 9 insertions, 9 deletions
diff --git a/libraries/base/Data/Bits.hs b/libraries/base/Data/Bits.hs
index da2ea3d18f..1fc388040c 100644
--- a/libraries/base/Data/Bits.hs
+++ b/libraries/base/Data/Bits.hs
@@ -241,7 +241,7 @@ class Eq a => Bits a where
x `shiftR` i = x `shift` (-i)
{-| Shift the first argument right by the specified number of bits, which
- must be non-negative an smaller than the number of bits in the type.
+ must be non-negative and smaller than the number of bits in the type.
Right shifts perform sign extension on signed number types;
i.e. they fill the top bits with 1 if the @x@ is negative
diff --git a/libraries/base/Data/Data.hs b/libraries/base/Data/Data.hs
index 3d257e0f17..e22f7cb082 100644
--- a/libraries/base/Data/Data.hs
+++ b/libraries/base/Data/Data.hs
@@ -793,7 +793,7 @@ mkRealConstr dt f = case datarep dt of
FloatRep -> mkPrimCon dt (show f) (FloatConstr (toRational f))
_ -> errorWithoutStackTrace $ "Data.Data.mkRealConstr is not supported for "
++ dataTypeName dt ++
- ", as it is not an Real data type."
+ ", as it is not a Real data type."
-- | Makes a constructor for 'Char'.
mkCharConstr :: DataType -> Char -> Constr
diff --git a/libraries/base/GHC/Event/PSQ.hs b/libraries/base/GHC/Event/PSQ.hs
index 976ffe16b3..07b8de614b 100644
--- a/libraries/base/GHC/Event/PSQ.hs
+++ b/libraries/base/GHC/Event/PSQ.hs
@@ -58,7 +58,7 @@ import GHC.Types (Int)
{-
-- Use macros to define strictness of functions.
--- STRICT_x_OF_y denotes an y-ary function strict in the x-th parameter.
+-- STRICT_x_OF_y denotes a y-ary function strict in the x-th parameter.
-- We do not use BangPatterns, because they are not in any standard and we
-- want the compilers to be compiled by as many compilers as possible.
#define STRICT_1_OF_2(fn) fn arg _ | arg `seq` False = undefined
diff --git a/libraries/base/GHC/Show.hs b/libraries/base/GHC/Show.hs
index 75080b3c90..980b4a7d85 100644
--- a/libraries/base/GHC/Show.hs
+++ b/libraries/base/GHC/Show.hs
@@ -469,7 +469,7 @@ instance Show Integer where
| otherwise = integerToString n r
showList = showList__ (showsPrec 0)
--- Divide an conquer implementation of string conversion
+-- Divide and conquer implementation of string conversion
integerToString :: Integer -> String -> String
integerToString n0 cs0
| n0 < 0 = '-' : integerToString' (- n0) cs0
diff --git a/libraries/base/cbits/primFloat.c b/libraries/base/cbits/primFloat.c
index f0746775d3..dde5d06503 100644
--- a/libraries/base/cbits/primFloat.c
+++ b/libraries/base/cbits/primFloat.c
@@ -315,7 +315,7 @@ rintFloat(HsFloat f)
mant += 2*half;
if (mant == FLT_POWER2)
{
- /* next power of 2, increase exponent an set mantissa to 0 */
+ /* next power of 2, increase exponent and set mantissa to 0 */
u.ieee.mantissa = 0;
u.ieee.exponent += 1;
return u.f;
diff --git a/libraries/integer-simple/GHC/Integer.hs b/libraries/integer-simple/GHC/Integer.hs
index f419b2f592..a519acea9a 100644
--- a/libraries/integer-simple/GHC/Integer.hs
+++ b/libraries/integer-simple/GHC/Integer.hs
@@ -11,7 +11,7 @@
-- Stability : internal
-- Portability : non-portable (GHC Extensions)
--
--- An simple definition of the 'Integer' type.
+-- A simple definition of the 'Integer' type.
--
-----------------------------------------------------------------------------
diff --git a/libraries/integer-simple/GHC/Integer/Simple/Internals.hs b/libraries/integer-simple/GHC/Integer/Simple/Internals.hs
index 64d0d6fd79..50733d4c0e 100644
--- a/libraries/integer-simple/GHC/Integer/Simple/Internals.hs
+++ b/libraries/integer-simple/GHC/Integer/Simple/Internals.hs
@@ -11,7 +11,7 @@
-- Stability : internal
-- Portability : non-portable (GHC Extensions)
--
--- An simple definition of the 'Integer' type.
+-- A simple definition of the 'Integer' type.
--
-----------------------------------------------------------------------------
diff --git a/libraries/integer-simple/GHC/Integer/Type.hs b/libraries/integer-simple/GHC/Integer/Type.hs
index 31f852bbd1..cabdfe5a53 100644
--- a/libraries/integer-simple/GHC/Integer/Type.hs
+++ b/libraries/integer-simple/GHC/Integer/Type.hs
@@ -18,7 +18,7 @@
-- Stability : internal
-- Portability : non-portable (GHC Extensions)
--
--- An simple definition of the 'Integer' type.
+-- A simple definition of the 'Integer' type.
--
-----------------------------------------------------------------------------
diff --git a/libraries/integer-simple/integer-simple.cabal b/libraries/integer-simple/integer-simple.cabal
index 0c05ad71ec..231619c6c7 100644
--- a/libraries/integer-simple/integer-simple.cabal
+++ b/libraries/integer-simple/integer-simple.cabal
@@ -6,7 +6,7 @@ license-file: LICENSE
maintainer: igloo@earth.li
synopsis: Simple Integer library
description:
- This package contains an simple Integer library.
+ This package contains a simple Integer library.
cabal-version: >=1.10
build-type: Simple