diff options
author | Gabor Greif <ggreif@gmail.com> | 2014-08-01 02:03:08 +0200 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2014-08-01 02:05:36 +0200 |
commit | 1c1ef82409dbff3ad914d1eddd976dec9a293b01 (patch) | |
tree | 66efeaaa870f6f23cc9f2f62218b188e92878920 | |
parent | 58ed1cc2dc2b3cbe085655331b1cc14049fecf5b (diff) | |
download | haskell-1c1ef82409dbff3ad914d1eddd976dec9a293b01.tar.gz |
Typo fixes
-rw-r--r-- | compiler/basicTypes/BasicTypes.lhs | 4 | ||||
-rw-r--r-- | compiler/main/DynFlags.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcBinds.lhs | 2 | ||||
-rw-r--r-- | compiler/types/InstEnv.lhs | 6 | ||||
-rw-r--r-- | docs/users_guide/glasgow_exts.xml | 6 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/ghci/p13.stderr | 2 |
6 files changed, 11 insertions, 11 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. diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml index 5166c28f0e..84d6a62cbf 100644 --- a/docs/users_guide/glasgow_exts.xml +++ b/docs/users_guide/glasgow_exts.xml @@ -5062,11 +5062,11 @@ A more precise specification is as follows. The willingness to be overlapped or incoherent is a property of the <emphasis>instance declaration</emphasis> itself, controlled as follows: <itemizedlist> -<listitem><para>An instance is <emphasis>incoherent</emphasis> if it has an <literal>INCOHERENT</literal> pragama, or if it appears in a module compiled with <literal>-XIncoherentInstances</literal>. +<listitem><para>An instance is <emphasis>incoherent</emphasis> if it has an <literal>INCOHERENT</literal> pragma, or if it appears in a module compiled with <literal>-XIncoherentInstances</literal>. </para></listitem> -<listitem><para>An instance is <emphasis>overlappable</emphasis> if it has an <literal>OVERLAPPABLE</literal> or <literal>OVERLAPS</literal> pragama, or if it appears in a module compiled with <literal>-XOverlappingInstances</literal>, or if the instance is incoherent. +<listitem><para>An instance is <emphasis>overlappable</emphasis> if it has an <literal>OVERLAPPABLE</literal> or <literal>OVERLAPS</literal> pragma, or if it appears in a module compiled with <literal>-XOverlappingInstances</literal>, or if the instance is incoherent. </para></listitem> -<listitem><para>An instance is <emphasis>overlapping</emphasis> if it has an <literal>OVERLAPPING</literal> or <literal>OVERLAPS</literal> pragama, or if it appears in a module compiled with <literal>-XOverlappingInstances</literal>, or if the instance is incoherent. +<listitem><para>An instance is <emphasis>overlapping</emphasis> if it has an <literal>OVERLAPPING</literal> or <literal>OVERLAPS</literal> pragma, or if it appears in a module compiled with <literal>-XOverlappingInstances</literal>, or if the instance is incoherent. </para></listitem> </itemizedlist> The <option>-XOverlappingInstances</option> language extension is now deprecated in favour diff --git a/testsuite/tests/safeHaskell/ghci/p13.stderr b/testsuite/tests/safeHaskell/ghci/p13.stderr index 44f8ff4ac0..7a743f18eb 100644 --- a/testsuite/tests/safeHaskell/ghci/p13.stderr +++ b/testsuite/tests/safeHaskell/ghci/p13.stderr @@ -1,6 +1,6 @@ P13_A.hs:1:14: Warning: - -XOverlappingInstances is deprecated: instead use per-instance pragamas OVERLAPPING/OVERLAPPABLE/OVERLAPS + -XOverlappingInstances is deprecated: instead use per-instance pragmas OVERLAPPING/OVERLAPPABLE/OVERLAPS <interactive>:11:1: Unsafe overlapping instances for Pos [Int] |