Commit d97a6fe2 authored by Gabor Greif's avatar Gabor Greif 💬

Fix typos in diagnostics, testsuite and comments

parent fee403fd
......@@ -512,7 +512,7 @@ literalType (MachLabel _ _ _) = addrPrimTy
literalType (LitInteger _ t) = t
absentLiteralOf :: TyCon -> Maybe Literal
-- Return a literal of the appropriate primtive
-- Return a literal of the appropriate primitive
-- TyCon, to use as a placeholder when it doesn't matter
absentLiteralOf tc = lookupUFM absent_lits (tyConName tc)
......
......@@ -226,7 +226,7 @@ mkStaticClosure dflags info_lbl ccs payload padding static_link_field saved_info
++ static_link_field
++ saved_info_field
-- JD: Simon had ellided this padding, but without it the C back end asserts
-- JD: Simon had elided this padding, but without it the C back end asserts
-- failure. Maybe it's a bad assertion, and this padding is indeed unnecessary?
padLitToWord :: DynFlags -> CmmLit -> [CmmLit]
padLitToWord dflags lit = lit : padding pad_length
......
......@@ -1013,7 +1013,7 @@ drop_dicts drops dictionary bindings on the LHS where possible.
RULE forall s (d :: MonadAbstractIOST (ReaderT s)).
useAbstractMonad (ReaderT s) d = $suseAbstractMonad s
Trac #8848 is a good example of where there are some intersting
Trac #8848 is a good example of where there are some interesting
dictionary bindings to discard.
The drop_dicts algorithm is based on these observations:
......
......@@ -134,7 +134,7 @@ unboxArg :: CoreExpr -- The supplied argument, not levity-pol
-- always returns a non-levity-polymorphic expression
unboxArg arg
-- Primtive types: nothing to unbox
-- Primitive types: nothing to unbox
| isPrimitiveType arg_ty
= return (arg, \body -> body)
......
......@@ -70,7 +70,7 @@ import Data.Int ( Int8, Int16, Int32, Int64 )
-- squeese functions for the graph allocator -----------------------------------
-- | regSqueeze_class reg
-- Calculuate the maximum number of register colors that could be
-- Calculate the maximum number of register colors that could be
-- denied to a node of this class due to having this reg
-- as a neighbour.
--
......
......@@ -75,7 +75,7 @@ classOfRealReg reg
-- | regSqueeze_class reg
-- Calculuate the maximum number of register colors that could be
-- Calculate the maximum number of register colors that could be
-- denied to a node of this class due to having this reg
-- as a neighbour.
--
......
......@@ -61,7 +61,7 @@ import Platform
import qualified Data.Array as A
-- | regSqueeze_class reg
-- Calculuate the maximum number of register colors that could be
-- Calculate the maximum number of register colors that could be
-- denied to a node of this class due to having this reg
-- as a neighbour.
--
......
......@@ -1253,7 +1253,7 @@ It is enabled by default and disabled by the flag
Note [Safe Haskell and GHCi]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
We DONT do this Safe Haskell as we need to check imports. We can
We DON'T do this Safe Haskell as we need to check imports. We can
and should instead check the qualified import but at the moment
this requires some refactoring so leave as a TODO
-}
......
......@@ -170,7 +170,7 @@ we treat it like this (occAnalRecBind):
4. To do so we form a new set of Nodes, with the same details, but
different edges, the "loop-breaker nodes". The loop-breaker nodes
have both more and fewer depedencies than the scope edges
have both more and fewer dependencies than the scope edges
(see Note [Choosing loop breakers])
More edges: if f calls g, and g has an active rule that mentions h
......
......@@ -120,7 +120,7 @@ data FloatSpec
= FloatMe Level -- Float to just inside the binding
-- tagged with this level
| StayPut Level -- Stay where it is; binding is
-- tagged with tihs level
-- tagged with this level
floatSpecLevel :: FloatSpec -> Level
floatSpecLevel (FloatMe l) = l
......
......@@ -586,7 +586,7 @@ more than N times (controlled by -fspec-constr-recursive=N) we check
specialisations. If sc_count is "no limit" then we arbitrarily
choose 10 as the limit (ugh).
See Trac #5550. Also Trac #13623, where this test had become over-agressive,
See Trac #5550. Also Trac #13623, where this test had become over-aggressive,
and we lost a wonderful specialisation that we really wanted!
Note [NoSpecConstr]
......
......@@ -426,7 +426,7 @@ checkFunApp fun_ty arg_tys msg
= (Nothing, Nothing)
-- | "Compare" types. We used to try a crude comparison of the type themselves,
-- but this is essentially impossible in STG as we have discarded. both casts
-- but this is essentially impossible in STG as we have discarded both casts
-- and type applications, so types might look different but be the same. Now we
-- simply compare their runtime representations. See #14120.
stgEqType :: Type -> Type -> Bool
......
......@@ -458,7 +458,7 @@ gen_Ord_binds loc tycon = do
mkTagCmp :: DynFlags -> OrdOp -> LHsExpr GhcPs
-- Both constructors known to be nullary
-- genreates (case data2Tag a of a# -> case data2Tag b of b# -> a# `op` b#
-- generates (case data2Tag a of a# -> case data2Tag b of b# -> a# `op` b#
mkTagCmp dflags op =
untag_Expr dflags tycon[(a_RDR, ah_RDR),(b_RDR, bh_RDR)] $
unliftedOrdOp tycon intPrimTy op ah_RDR bh_RDR
......
......@@ -1670,7 +1670,7 @@ generic default methods.
Note [INLINE and default methods]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Default methods need special case. They are supposed to behave rather like
macros. For exmample
macros. For example
class Foo a where
op1, op2 :: Bool -> a -> a
......
......@@ -1153,7 +1153,7 @@ buildImplication skol_info skol_tvs given thing_inside
else -- Fast path. We check every function argument with
-- tcPolyExpr, which uses tcSkolemise and hence checkConstraints.
-- So tihs fast path is well-exercised
-- So this fast path is well-exercised
do { res <- thing_inside
; return (emptyBag, emptyTcEvBinds, res) } }
......@@ -1162,7 +1162,7 @@ implicationNeeded :: [TcTyVar] -> [EvVar] -> TcM Bool
-- to have an EvBindsVar for them when they might be deferred to
-- runtime. Otherwise, they end up as top-level unlifted bindings,
-- which are verboten. See also Note [Deferred errors for coercion holes]
-- in TcErrors. cf Trac #14149 for an exmample of what goes wrong.
-- in TcErrors. cf Trac #14149 for an example of what goes wrong.
implicationNeeded skol_tvs given
| null skol_tvs
, null given
......
......@@ -868,7 +868,7 @@ pprUserTypeErrorTy ty =
| tyConName tc == typeErrorVAppendDataConName ->
pprUserTypeErrorTy t1 $$ pprUserTypeErrorTy t2
-- An uneavaluated type function
-- An unevaluated type function
_ -> ppr ty
......@@ -1186,7 +1186,7 @@ to differ, leading to a contradiction. Thus, co is reflexive.
Accordingly, by eliminating reflexive casts, splitTyConApp need not worry
about outermost casts to uphold (*).
Unforunately, that's not the end of the story. Consider comparing
Unfortunately, that's not the end of the story. Consider comparing
(T a b c) =? (T a b |> (co -> <Type>)) (c |> sym co)
These two types have the same kind (Type), but the left type is a TyConApp
while the right type is not. To handle this case, we will have to implement
......
......@@ -498,7 +498,7 @@ instance Binary DiffTime where
--
-- TODO This instance is not architecture portable. GMP stores numbers as
-- arrays of machine sized words, so the byte format is not portable across
-- architectures with different endianness and word size.
--
-- This makes it hard (impossible) to make an equivalent instance
-- with code that is compilable with non-GHC. Do we need any instance
......
......@@ -314,7 +314,7 @@ stronglyConnCompFromEdgedVerticesUniq
= map (fmap node_payload) . stronglyConnCompFromEdgedVerticesUniqR
-- The "R" interface is used when you expect to apply SCC to
-- (some of) the result of SCC, so you dont want to lose the dependency info
-- (some of) the result of SCC, so you don't want to lose the dependency info
-- See Note [Deterministic SCC]
-- See Note [reduceNodesIntoVertices implementations]
stronglyConnCompFromEdgedVerticesOrdR
......@@ -325,7 +325,7 @@ stronglyConnCompFromEdgedVerticesOrdR =
stronglyConnCompG . graphFromEdgedVertices reduceNodesIntoVerticesOrd
-- The "R" interface is used when you expect to apply SCC to
-- (some of) the result of SCC, so you dont want to lose the dependency info
-- (some of) the result of SCC, so you don't want to lose the dependency info
-- See Note [Deterministic SCC]
-- See Note [reduceNodesIntoVertices implementations]
stronglyConnCompFromEdgedVerticesUniqR
......
......@@ -38,9 +38,9 @@ createBCOs bcos = do
createBCO :: Array Int HValue -> ResolvedBCO -> IO HValue
createBCO _ ResolvedBCO{..} | resolvedBCOIsLE /= isLittleEndian
= throwIO (ErrorCall $
unlines [ "The endianess of the ResolvedBCO does not match"
, "the systems endianess. Using ghc and iserv in a"
, "mixed endianess setup is not supported!"
unlines [ "The endianness of the ResolvedBCO does not match"
, "the systems endianness. Using ghc and iserv in a"
, "mixed endianness setup is not supported!"
])
createBCO arr bco
= do BCO bco# <- linkBCO' arr bco
......
......@@ -46,9 +46,9 @@ data ResolvedBCO
-- | The Binary instance for ResolvedBCOs.
--
-- Note, that we do encode the endianess, however there is no support for mixed
-- endianess setups. This is primarily to ensure that ghc and iserv share the
-- same endianess.
-- Note, that we do encode the endianness, however there is no support for mixed
-- endianness setups. This is primarily to ensure that ghc and iserv share the
-- same endianness.
instance Binary ResolvedBCO where
put ResolvedBCO{..} = do
put resolvedBCOIsLE
......
......@@ -11,7 +11,7 @@
#include "LinkerInternals.h"
#include <stdbool.h>
/* See Note [BFD Import library]. */
/* See Note [BFD import library]. */
typedef enum _SymbolKind {
KIND_NORMAL = 0x01,
KIND_WEAK = 0x02,
......
......@@ -439,7 +439,7 @@ ocVerifyImage_ELF ( ObjectCode* oc )
if (!SECTION_INDEX_VALID(shdr[i].sh_link)) {
if (shdr[i].sh_link == SHN_UNDEF)
errorBelch("\n%s: relocation section #%d has no symbol table\n"
"This object file has probably been fully striped. "
"This object file has probably been fully stripped. "
"Such files cannot be linked.\n",
oc->archiveMemberName ? oc->archiveMemberName : oc->fileName, i);
else
......
......@@ -35,6 +35,6 @@ The reason was this:
i = I# x
Being an unboxed value, we were treating the argument context of x
as intersting, and hence inlining x in the arg of I#. But then we just
as interesting, and hence inlining x in the arg of I#. But then we just
float it out again, giving an infinite loop.
-}
......@@ -4,7 +4,7 @@
{-# LANGUAGE GADTs #-}
-- This test uses the PushC rule of the System FC operational semantics
-- Writen by Tom Schrijvers
-- Written by Tom Schrijvers
module CoTest3 where
......
......@@ -94,7 +94,7 @@
getCurrColour `thenP` \ col ->
let
invert Black r = r -- because the move has *already* happend
invert _ "0.00" = "0.00" -- dont negate 0
invert _ "0.00" = "0.00" -- don't negate 0
invert _ ('-':r) = r
invert _ r = '-':r
in
......
......@@ -7076,7 +7076,7 @@ white scored a decisive victory.
\end{tabular}}|
\end{center}
|13.~h3, Bh5; 14.~Nbd2, Rfd8; 15.~Nb3, Qd6; 16.~Qe2, Rab8; 17.~Red1|
Fritz is deperate to put h3, but I dont see why.
Fritz is desperate to put h3, but I don't see why.
\begin{center}|
{\bf\begin{tabular}{rp{50pt}p{50pt}}
13 & \ldots & Nh5\\
......
......@@ -1299,7 +1299,7 @@ like Game 7 of the Short-Kasparov WC, where Kasparov as white scored a
decisive victory.}) 8... Bg4 9. d3 h6 10. Be3 O-O (10... Bxe3 11. Rxe3
O-O 12. a4 b4 13. h3 Bh5 14. Nbd2 Rb8 {=}) 11. Bxc5 dxc5 12. Bc2 Qd7
13. Nbd2 (13. h3 Bh5 14. Nbd2 Rfd8 15. Nb3 Qd6 16. Qe2 Rab8 17. Red1 {
Fritz is deperate to put h3, but I dont see why.}) 13... Nh5 {} (13...
Fritz is desperate to put h3, but I don't see why.}) 13... Nh5 {} (13...
Rad8 {is an idea.}) 14. Nb3 (14. h3 {<saw>,0.33 I now agree with this,
because the knight block the h5 retreat square.}) 14... Nf4 {?} (14...
Qd6 15. h3 Be6 16. Ng5 Bxb3 17. axb3 Nf4 18. Nf3 {<sab>}) 15. Nxc5 Qc8 (
......
......@@ -293,7 +293,7 @@ offsetToPoint (r,v) i = r `addPV` (i `multSV` v)
--
epsilon, inf :: Double -- aproximate zero and infinity
epsilon, inf :: Double -- approximate zero and infinity
epsilon = 1.0e-10
inf = 1.0e20
......
module T14137 where
-- The point of this test is that we should inline 'thunk'
-- into j's RHS, and we can do so quite agressively, even
-- into j's RHS, and we can do so quite aggressively, even
-- when we aren't optimising. See the ticket.
--
-- It's not a big deal, because in the end FloatIn
......
......@@ -12,11 +12,11 @@ import System.IO
import System.IO.Unsafe ( unsafePerformIO )
{-# NOINLINE [0] sndSnd #-}
-- Dont inline till last, to give the rule a chance
-- Don't inline till last, to give the rule a chance
sndSnd (a,(b,c)) = (a,c)
{-# NOINLINE [2] myFst #-}
-- Dont inline till last, to give the rule a chance
-- Don't inline till last, to give the rule a chance
myFst (a,b) = a
trace x y = unsafePerformIO (hPutStr stderr x >> hPutStr stderr "\n" >> return y)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment