summaryrefslogtreecommitdiff
path: root/compiler/GHC
diff options
context:
space:
mode:
authorKrzysztof Gogolewski <krzysztof.gogolewski@tweag.io>2020-10-01 21:32:52 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-10-02 08:00:25 -0400
commita9ae83af9e0cf48e860f2b7e1d50a057cb8a7890 (patch)
tree3aa9de1ffd2ac471b14a0342a5a2e8bbba6f5a90 /compiler/GHC
parent1edd6d21c0abea34b498a627234a97df21648024 (diff)
downloadhaskell-a9ae83af9e0cf48e860f2b7e1d50a057cb8a7890.tar.gz
Fix typos in comments
[skip ci]
Diffstat (limited to 'compiler/GHC')
-rw-r--r--compiler/GHC/Builtin/Names.hs2
-rw-r--r--compiler/GHC/Builtin/primops.txt.pp2
-rw-r--r--compiler/GHC/CmmToAsm.hs2
-rw-r--r--compiler/GHC/Core/InstEnv.hs2
-rw-r--r--compiler/GHC/Core/Lint.hs2
-rw-r--r--compiler/GHC/Core/Make.hs2
-rw-r--r--compiler/GHC/Core/Opt/Simplify/Env.hs2
-rw-r--r--compiler/GHC/Core/Opt/Specialise.hs2
-rw-r--r--compiler/GHC/Core/TyCo/Rep.hs2
-rw-r--r--compiler/GHC/Core/Utils.hs2
-rw-r--r--compiler/GHC/CoreToByteCode.hs2
-rw-r--r--compiler/GHC/Driver/Session.hs2
-rw-r--r--compiler/GHC/Iface/Type.hs2
-rw-r--r--compiler/GHC/Tc/Errors/Hole.hs2
-rw-r--r--compiler/GHC/Tc/Gen/App.hs4
-rw-r--r--compiler/GHC/Tc/Gen/Export.hs2
-rw-r--r--compiler/GHC/Tc/Gen/Head.hs2
-rw-r--r--compiler/GHC/Tc/Instance/Class.hs2
-rw-r--r--compiler/GHC/Tc/Module.hs2
-rw-r--r--compiler/GHC/Tc/Solver/Interact.hs2
-rw-r--r--compiler/GHC/ThToHs.hs2
-rw-r--r--compiler/GHC/Types/Id/Make.hs4
22 files changed, 24 insertions, 24 deletions
diff --git a/compiler/GHC/Builtin/Names.hs b/compiler/GHC/Builtin/Names.hs
index 3628b6f3b4..d73aa58472 100644
--- a/compiler/GHC/Builtin/Names.hs
+++ b/compiler/GHC/Builtin/Names.hs
@@ -1668,7 +1668,7 @@ datatypeClassKey = mkPreludeClassUnique 39
constructorClassKey = mkPreludeClassUnique 40
selectorClassKey = mkPreludeClassUnique 41
--- KnownNat: see Note [KnowNat & KnownSymbol and EvLit] in GHC.Tc.Types.Evidence
+-- KnownNat: see Note [KnownNat & KnownSymbol and EvLit] in GHC.Tc.Types.Evidence
knownNatClassNameKey :: Unique
knownNatClassNameKey = mkPreludeClassUnique 42
diff --git a/compiler/GHC/Builtin/primops.txt.pp b/compiler/GHC/Builtin/primops.txt.pp
index 9cbe75be35..305f692908 100644
--- a/compiler/GHC/Builtin/primops.txt.pp
+++ b/compiler/GHC/Builtin/primops.txt.pp
@@ -163,7 +163,7 @@ defaults
--
-- Unfortunately, for the time being most of the primops which should be
-- moved according to the previous paragraph can't yet. There are some
--- superficial restrictions in `foreign import prim` which mus be fixed
+-- superficial restrictions in `foreign import prim` which must be fixed
-- first. Specifically, `foreign import prim` always requires:
--
-- - No polymorphism in type
diff --git a/compiler/GHC/CmmToAsm.hs b/compiler/GHC/CmmToAsm.hs
index 18590a3ee8..7112d603b6 100644
--- a/compiler/GHC/CmmToAsm.hs
+++ b/compiler/GHC/CmmToAsm.hs
@@ -1174,7 +1174,7 @@ initNCGConfig dflags = NCGConfig
ArchX86 -> bmiVersion dflags
_ -> Nothing
- -- We Assume SSE1 and SSE2 operations are available on both
+ -- We assume SSE1 and SSE2 operations are available on both
-- x86 and x86_64. Historically we didn't default to SSE2 and
-- SSE1 on x86, which results in defacto nondeterminism for how
-- rounding behaves in the associated x87 floating point instructions
diff --git a/compiler/GHC/Core/InstEnv.hs b/compiler/GHC/Core/InstEnv.hs
index 60f16075cc..e8603a4cae 100644
--- a/compiler/GHC/Core/InstEnv.hs
+++ b/compiler/GHC/Core/InstEnv.hs
@@ -234,7 +234,7 @@ pprInstances :: [ClsInst] -> SDoc
pprInstances ispecs = vcat (map pprInstance ispecs)
instanceHead :: ClsInst -> ([TyVar], Class, [Type])
--- Returns the head, using the fresh tyavs from the ClsInst
+-- Returns the head, using the fresh tyvars from the ClsInst
instanceHead (ClsInst { is_tvs = tvs, is_tys = tys, is_dfun = dfun })
= (tvs, cls, tys)
where
diff --git a/compiler/GHC/Core/Lint.hs b/compiler/GHC/Core/Lint.hs
index 69cd263699..7f8fb351e0 100644
--- a/compiler/GHC/Core/Lint.hs
+++ b/compiler/GHC/Core/Lint.hs
@@ -178,7 +178,7 @@ in GHC.Core.Opt.WorkWrap.Utils. (Maybe there are other "clients" of this featur
might reject a correct program. So we carry a type substitution (in
this example [a -> Bool]) and apply this substitution before
comparing types. In effect, in Lint, type equality is always
- equality-moduolo-le-subst. This is in the le_subst field of
+ equality-modulo-le-subst. This is in the le_subst field of
LintEnv. But nota bene:
(SI1) The le_subst substitution is applied to types and coercions only
diff --git a/compiler/GHC/Core/Make.hs b/compiler/GHC/Core/Make.hs
index c242c776e6..ca054263b4 100644
--- a/compiler/GHC/Core/Make.hs
+++ b/compiler/GHC/Core/Make.hs
@@ -940,7 +940,7 @@ We use aBSENT_ERROR_ID to build dummy values in workers. E.g.
f x = (case x of (a,b) -> b) + 1::Int
-The demand analyser figures ot that only the second component of x is
+The demand analyser figures out that only the second component of x is
used, and does a w/w split thus
f x = case x of (a,b) -> $wf b
diff --git a/compiler/GHC/Core/Opt/Simplify/Env.hs b/compiler/GHC/Core/Opt/Simplify/Env.hs
index 7d53a2db2b..29f0dc58b2 100644
--- a/compiler/GHC/Core/Opt/Simplify/Env.hs
+++ b/compiler/GHC/Core/Opt/Simplify/Env.hs
@@ -809,7 +809,7 @@ subst_id_bndr env@(SimplEnv { seInScope = in_scope, seIdSubst = id_subst })
= ASSERT2( not (isCoVar old_id), ppr old_id )
(env { seInScope = in_scope `extendInScopeSet` new_id,
seIdSubst = new_subst }, new_id)
- -- It's important that both seInScope and seIdSubt are updated with
+ -- It's important that both seInScope and seIdSubst are updated with
-- the new_id, /after/ applying adjust_type. That's why adjust_type
-- is done here. If we did adjust_type in simplJoinBndr (the only
-- place that gives a non-identity adjust_type) we'd have to fiddle
diff --git a/compiler/GHC/Core/Opt/Specialise.hs b/compiler/GHC/Core/Opt/Specialise.hs
index ba5679778b..30e9689619 100644
--- a/compiler/GHC/Core/Opt/Specialise.hs
+++ b/compiler/GHC/Core/Opt/Specialise.hs
@@ -946,7 +946,7 @@ and we get a loop!
Note [specImport call stack]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
When specialising an imports function 'f', we may get new calls
-of an imported fuction 'g', which we want to specialise in turn,
+of an imported function 'g', which we want to specialise in turn,
and similarly specialising 'g' might expose a new call to 'h'.
We track the stack of enclosing functions. So when specialising 'h' we
diff --git a/compiler/GHC/Core/TyCo/Rep.hs b/compiler/GHC/Core/TyCo/Rep.hs
index 5215b5ce2e..87cd0ed6bb 100644
--- a/compiler/GHC/Core/TyCo/Rep.hs
+++ b/compiler/GHC/Core/TyCo/Rep.hs
@@ -2032,7 +2032,7 @@ GHC.Core.Multiplicity above this module.
-- | A shorthand for data with an attached 'Mult' element (the multiplicity).
data Scaled a = Scaled Mult a
deriving (Data.Data)
- -- You might think that this would be a natural candiate for
+ -- You might think that this would be a natural candidate for
-- Functor, Traversable but Krzysztof says (!3674) "it was too easy
-- to accidentally lift functions (substitutions, zonking etc.) from
-- Type -> Type to Scaled Type -> Scaled Type, ignoring
diff --git a/compiler/GHC/Core/Utils.hs b/compiler/GHC/Core/Utils.hs
index 3feb275843..0193c5e43d 100644
--- a/compiler/GHC/Core/Utils.hs
+++ b/compiler/GHC/Core/Utils.hs
@@ -604,7 +604,7 @@ which allows only (Coercion co) on the RHS.
************************************************************************
* *
- Operations oer case alternatives
+ Operations over case alternatives
* *
************************************************************************
diff --git a/compiler/GHC/CoreToByteCode.hs b/compiler/GHC/CoreToByteCode.hs
index 051abd4d8b..f4c23237c0 100644
--- a/compiler/GHC/CoreToByteCode.hs
+++ b/compiler/GHC/CoreToByteCode.hs
@@ -625,7 +625,7 @@ schemeE d s p exp@(AnnTick (Breakpoint _id _fvs) _rhs)
-- match = /\(r::RuntimeRep) /\(a::TYPE r).
-- \(k :: Int -> a) \(v::T).
-- case v of MkV n -> k n
- -- Here (k n) :: a :: Type r, so we don't know if it's lifted
+ -- Here (k n) :: a :: TYPE r, so we don't know if it's lifted
-- or not; but that should be fine provided we add that void arg.
id <- newId (mkVisFunTyMany realWorldStatePrimTy ty)
diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
index f54e38c682..40987425b5 100644
--- a/compiler/GHC/Driver/Session.hs
+++ b/compiler/GHC/Driver/Session.hs
@@ -4910,7 +4910,7 @@ isSseEnabled platform = case platformArch platform of
isSse2Enabled :: Platform -> Bool
isSse2Enabled platform = case platformArch platform of
- -- We Assume SSE1 and SSE2 operations are available on both
+ -- We assume SSE1 and SSE2 operations are available on both
-- x86 and x86_64. Historically we didn't default to SSE2 and
-- SSE1 on x86, which results in defacto nondeterminism for how
-- rounding behaves in the associated x87 floating point instructions
diff --git a/compiler/GHC/Iface/Type.hs b/compiler/GHC/Iface/Type.hs
index 73ce53e34d..2e33770812 100644
--- a/compiler/GHC/Iface/Type.hs
+++ b/compiler/GHC/Iface/Type.hs
@@ -987,7 +987,7 @@ mismatch between two skolems
We certainly don't want to say "Can't match LiftedRep ~ LiftedRep"!
But if we are printing the type
- (forall (a :: Type r). blah
+ (forall (a :: TYPE r). blah
we do want to turn that (free) r into LiftedRep, so it prints as
(forall a. blah)
diff --git a/compiler/GHC/Tc/Errors/Hole.hs b/compiler/GHC/Tc/Errors/Hole.hs
index 3ff2312903..b50ff2e804 100644
--- a/compiler/GHC/Tc/Errors/Hole.hs
+++ b/compiler/GHC/Tc/Errors/Hole.hs
@@ -601,7 +601,7 @@ findValidHoleFits tidy_env implics simples h@(Hole { hole_sort = ExprHole _
; traceTc "findingValidHoleFitsFor }" empty
; return (tidy_env, vMsg $$ refMsg) }
where
- -- We extract the type, the tcLevel and the types free variables
+ -- We extract the type, the TcLevel and the types free variables
-- from the constraint.
hole_fvs :: FV
hole_fvs = tyCoFVsOfType hole_ty
diff --git a/compiler/GHC/Tc/Gen/App.hs b/compiler/GHC/Tc/Gen/App.hs
index 702149784d..13b92a43c2 100644
--- a/compiler/GHC/Tc/Gen/App.hs
+++ b/compiler/GHC/Tc/Gen/App.hs
@@ -196,7 +196,7 @@ tcApp works like this:
The "list of arguments" is [HsExprArg], described in Note [HsExprArg].
in GHC.Tc.Gen.Head
-2. Use tcInferAppHead to infer the type of the fuction,
+2. Use tcInferAppHead to infer the type of the function,
as an (uninstantiated) TcSigmaType
There are special cases for
HsVar, HsRecFld, and ExprWithTySig
@@ -588,7 +588,7 @@ Consider (#15859)
data A k :: k -> Type -- A :: forall k -> k -> Type
type KindOf (a :: k) = k -- KindOf :: forall k. k -> Type
- a = (undefind :: KindOf A) @Int
+ a = (undefined :: KindOf A) @Int
With ImpredicativeTypes (thin ice, I know), we instantiate
KindOf at type (forall k -> k -> Type), so
diff --git a/compiler/GHC/Tc/Gen/Export.hs b/compiler/GHC/Tc/Gen/Export.hs
index c30773fbd4..ec4475edea 100644
--- a/compiler/GHC/Tc/Gen/Export.hs
+++ b/compiler/GHC/Tc/Gen/Export.hs
@@ -579,7 +579,7 @@ lookupChildrenExport spec_parent rdr_items =
--
-- Note: [Types of TyCon]
--
--- This check appears to be overlly complicated, Richard asked why it
+-- This check appears to be overly complicated, Richard asked why it
-- is not simply just `isAlgTyCon`. The answer for this is that
-- a classTyCon is also an `AlgTyCon` which we explicitly want to disallow.
-- (It is either a newtype or data depending on the number of methods)
diff --git a/compiler/GHC/Tc/Gen/Head.hs b/compiler/GHC/Tc/Gen/Head.hs
index 530f985a95..163f5cda5b 100644
--- a/compiler/GHC/Tc/Gen/Head.hs
+++ b/compiler/GHC/Tc/Gen/Head.hs
@@ -326,7 +326,7 @@ tcInferAppHead :: HsExpr GhcRn
-- See Note [Application chains and heads] in GHC.Tc.Gen.App
-- We get back a /SigmaType/ because we have special cases for
-- * A bare identifier (just look it up)
--- This case also covers a record selectro HsRecFld
+-- This case also covers a record selector HsRecFld
-- * An expression with a type signature (e :: ty)
-- See Note [Application chains and heads] in GHC.Tc.Gen.App
--
diff --git a/compiler/GHC/Tc/Instance/Class.hs b/compiler/GHC/Tc/Instance/Class.hs
index b66ad2d447..10270e3726 100644
--- a/compiler/GHC/Tc/Instance/Class.hs
+++ b/compiler/GHC/Tc/Instance/Class.hs
@@ -297,7 +297,7 @@ a more convenient function, defined in terms of `natSing`:
The reason we don't use this directly in the class is that it is simpler
and more efficient to pass around a Natural rather than an entire function,
-especially when the `KnowNat` evidence is packaged up in an existential.
+especially when the `KnownNat` evidence is packaged up in an existential.
The story for kind `Symbol` is analogous:
* class KnownSymbol
diff --git a/compiler/GHC/Tc/Module.hs b/compiler/GHC/Tc/Module.hs
index 6ae19bb6c7..0df9de0480 100644
--- a/compiler/GHC/Tc/Module.hs
+++ b/compiler/GHC/Tc/Module.hs
@@ -301,7 +301,7 @@ tcRnModuleTcRnM hsc_env mod_sum
tcg_env <- return (tcg_env
{ tcg_doc_hdr = maybe_doc_hdr })
; -- Report unused names
- -- Do this /after/ typeinference, so that when reporting
+ -- Do this /after/ type inference, so that when reporting
-- a function with no type signature we can give the
-- inferred type
reportUnusedNames tcg_env hsc_src
diff --git a/compiler/GHC/Tc/Solver/Interact.hs b/compiler/GHC/Tc/Solver/Interact.hs
index bbdfb56b71..57bca5fcec 100644
--- a/compiler/GHC/Tc/Solver/Interact.hs
+++ b/compiler/GHC/Tc/Solver/Interact.hs
@@ -2606,7 +2606,7 @@ because many good things flow from [W] t1 ~# t2.
The same reasoning applies to
-* (~~) heqTyCOn
+* (~~) heqTyCon
* (~) eqTyCon
* Coercible coercibleTyCon
diff --git a/compiler/GHC/ThToHs.hs b/compiler/GHC/ThToHs.hs
index bdc0203c90..450e231628 100644
--- a/compiler/GHC/ThToHs.hs
+++ b/compiler/GHC/ThToHs.hs
@@ -1689,7 +1689,7 @@ points so that the code is readable with its original meaning.
So scattered through "GHC.ThToHs" are various points where parens are added.
-See (among other closed issued) https://gitlab.haskell.org/ghc/ghc/issues/14289
+See (among other closed issues) https://gitlab.haskell.org/ghc/ghc/issues/14289
-}
-- ---------------------------------------------------------------------
diff --git a/compiler/GHC/Types/Id/Make.hs b/compiler/GHC/Types/Id/Make.hs
index 63a7d5a02a..85b9b06ad9 100644
--- a/compiler/GHC/Types/Id/Make.hs
+++ b/compiler/GHC/Types/Id/Make.hs
@@ -1564,7 +1564,7 @@ Note [seqId magic]
a) Its fixity is set in GHC.Iface.Load.ghcPrimIface
b) It has quite a bit of desugaring magic.
- See GHC.HsToCore.Utils Note [Desugaring seq (1)] and (2) and (3)
+ See GHC.HsToCore.Utils Note [Desugaring seq] (1) and (2) and (3)
c) There is some special rule handing: Note [User-defined RULES for seq]
@@ -1748,7 +1748,7 @@ definition in Core. The rewrite rule works as follows:
f (x `cast` co a) y
The `co` coercion is the newtype-coercion extracted from the type-class.
-The type class is obtain by looking at the type of wrap.
+The type class is obtained by looking at the type of wrap.
-------------------------------------------------------------