summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2014-08-01 02:03:08 +0200
committerGabor Greif <ggreif@gmail.com>2014-08-01 02:05:36 +0200
commit1c1ef82409dbff3ad914d1eddd976dec9a293b01 (patch)
tree66efeaaa870f6f23cc9f2f62218b188e92878920 /compiler
parent58ed1cc2dc2b3cbe085655331b1cc14049fecf5b (diff)
downloadhaskell-1c1ef82409dbff3ad914d1eddd976dec9a293b01.tar.gz
Typo fixes
Diffstat (limited to 'compiler')
-rw-r--r--compiler/basicTypes/BasicTypes.lhs4
-rw-r--r--compiler/main/DynFlags.hs2
-rw-r--r--compiler/typecheck/TcBinds.lhs2
-rw-r--r--compiler/types/InstEnv.lhs6
4 files changed, 7 insertions, 7 deletions
diff --git a/compiler/basicTypes/BasicTypes.lhs b/compiler/basicTypes/BasicTypes.lhs
index c6fb26ccd3..2f86db7796 100644
--- a/compiler/basicTypes/BasicTypes.lhs
+++ b/compiler/basicTypes/BasicTypes.lhs
@@ -508,7 +508,7 @@ data OverlapMode -- See Note [Rules for instance lookup] in InstEnv
| Overlaps
- -- ^ Equiavalent to having both `Overlapping` and `Overlappable` flags.
+ -- ^ Equivalent to having both `Overlapping` and `Overlappable` flags.
| Incoherent
-- ^ Behave like Overlappable and Overlapping, and in addition pick
@@ -815,7 +815,7 @@ data InlinePragma -- Note [InlinePragma]
, inl_rule :: RuleMatchInfo -- Should the function be treated like a constructor?
} deriving( Eq, Data, Typeable )
-data InlineSpec -- What the user's INLINE pragama looked like
+data InlineSpec -- What the user's INLINE pragma looked like
= Inline
| Inlinable
| NoInline
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 9c45f41f14..ac049aa171 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -2873,7 +2873,7 @@ xFlags = [
( "GeneralizedNewtypeDeriving", Opt_GeneralizedNewtypeDeriving, setGenDeriving ),
( "OverlappingInstances", Opt_OverlappingInstances,
\ turn_on -> when turn_on
- $ deprecate "instead use per-instance pragamas OVERLAPPING/OVERLAPPABLE/OVERLAPS" ),
+ $ deprecate "instead use per-instance pragmas OVERLAPPING/OVERLAPPABLE/OVERLAPS" ),
( "UndecidableInstances", Opt_UndecidableInstances, nop ),
( "IncoherentInstances", Opt_IncoherentInstances, nop ),
( "PackageImports", Opt_PackageImports, nop ),
diff --git a/compiler/typecheck/TcBinds.lhs b/compiler/typecheck/TcBinds.lhs
index 83a9591ac5..34db200ab6 100644
--- a/compiler/typecheck/TcBinds.lhs
+++ b/compiler/typecheck/TcBinds.lhs
@@ -839,7 +839,7 @@ tcSpec _ prag = pprPanic "tcSpec" (ppr prag)
--------------
tcImpPrags :: [LSig Name] -> TcM [LTcSpecPrag]
--- SPECIALISE pragamas for imported things
+-- SPECIALISE pragmas for imported things
tcImpPrags prags
= do { this_mod <- getModule
; dflags <- getDynFlags
diff --git a/compiler/types/InstEnv.lhs b/compiler/types/InstEnv.lhs
index 636147a461..aba2d3d645 100644
--- a/compiler/types/InstEnv.lhs
+++ b/compiler/types/InstEnv.lhs
@@ -462,16 +462,16 @@ The willingness to be overlapped or incoherent is a property of the
instance declaration itself, controlled as follows:
* An instance is "incoherent"
- if it has an INCOHERENT pragama, or
+ if it has an INCOHERENT pragma, or
if it appears in a module compiled with -XIncoherentInstances.
* An instance is "overlappable"
- if it has an OVERLAPPABLE or OVERLAPS pragama, or
+ if it has an OVERLAPPABLE or OVERLAPS pragma, or
if it appears in a module compiled with -XOverlappingInstances, or
if the instance is incoherent.
* An instance is "overlapping"
- if it has an OVERLAPPING or OVERLAPS pragama, or
+ if it has an OVERLAPPING or OVERLAPS pragma, or
if it appears in a module compiled with -XOverlappingInstances, or
if the instance is incoherent.
compiled with -XOverlappingInstances.