diff options
| -rw-r--r-- | compiler/backpack/NameShape.hs | 2 | ||||
| -rw-r--r-- | compiler/deSugar/Match.hs | 2 | ||||
| -rw-r--r-- | compiler/iface/IfaceEnv.hs | 2 | ||||
| -rw-r--r-- | compiler/prelude/primops.txt.pp | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcErrors.hs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/compiler/backpack/NameShape.hs b/compiler/backpack/NameShape.hs index 261fffb6fb..6ec243ef20 100644 --- a/compiler/backpack/NameShape.hs +++ b/compiler/backpack/NameShape.hs @@ -159,7 +159,7 @@ ns_module = mkHoleModule . ns_mod_name -- | Substitution on @{A.T}@. We enforce the invariant that the -- 'nameModule' of keys of this map have 'moduleUnitId' @hole@ -- (meaning that if we have a hole substitution, the keys of the map --- are never affected.) Alternately, this is isomorphic to +-- are never affected.) Alternatively, this is isomorphic to -- @Map ('ModuleName', 'OccName') 'Name'@. type ShNameSubst = NameEnv Name diff --git a/compiler/deSugar/Match.hs b/compiler/deSugar/Match.hs index 692db8b036..33dd7990c7 100644 --- a/compiler/deSugar/Match.hs +++ b/compiler/deSugar/Match.hs @@ -662,7 +662,7 @@ is collected here, in @matchWrapper@. This function takes as arguments: \begin{itemize} \item -Typchecked @Matches@ (of a function definition, or a case or lambda +Typechecked @Matches@ (of a function definition, or a case or lambda expression)---the main input; \item An error message to be inserted into any (runtime) pattern-matching diff --git a/compiler/iface/IfaceEnv.hs b/compiler/iface/IfaceEnv.hs index 46bc0e9905..f66ebdc321 100644 --- a/compiler/iface/IfaceEnv.hs +++ b/compiler/iface/IfaceEnv.hs @@ -143,7 +143,7 @@ updNameCache upd_fn = do { hsc_env <- getTopEnv -} -- | Look up the 'Name' for a given 'Module' and 'OccName'. --- Consider alternately using 'lookupIfaceTop' if you're in the 'IfL' monad +-- Consider alternatively using 'lookupIfaceTop' if you're in the 'IfL' monad -- and 'Module' is simply that of the 'ModIface' you are typechecking. lookupOrig :: Module -> OccName -> TcRnIf a b Name lookupOrig mod occ diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp index 41a725ff51..c16bc74de2 100644 --- a/compiler/prelude/primops.txt.pp +++ b/compiler/prelude/primops.txt.pp @@ -2713,7 +2713,7 @@ primop AddrToAnyOp "addrToAny#" GenPrimOp primop AnyToAddrOp "anyToAddr#" GenPrimOp a -> State# RealWorld -> (# State# RealWorld, Addr# #) - { Retrive the address of any Haskell value. This is + { Retrieve the address of any Haskell value. This is essentially an {\texttt unsafeCoerce\#}, but if implemented as such the core lint pass complains and fails to compile. As a primop, it is opaque to core/stg, and only appears diff --git a/compiler/typecheck/TcErrors.hs b/compiler/typecheck/TcErrors.hs index 290da2f63d..360142d7ac 100644 --- a/compiler/typecheck/TcErrors.hs +++ b/compiler/typecheck/TcErrors.hs @@ -1621,7 +1621,7 @@ mkTyVarEqErr dflags ctxt report ct oriented tv1 ty2 | OC_Occurs <- occ_check_expand -- We report an "occurs check" even for a ~ F t a, where F is a type - -- function; it's not insouble (because in principle F could reduce) + -- function; it's not insoluble (because in principle F could reduce) -- but we have certainly been unable to solve it -- See Note [Occurs check error] in TcCanonical = do { let main_msg = addArising (ctOrigin ct) $ |