Commit 717f3236 authored by Brian Wignall's avatar Brian Wignall Committed by Marge Bot

Fix more typos

parent 18baed64
Pipeline #13387 passed with stages
in 597 minutes and 59 seconds
......@@ -106,7 +106,7 @@ typecheck-testsuite:
- lint
# We allow the submodule checker to fail when run on merge requests (to
# accomodate, e.g., haddock changes not yet upstream) but not on `master` or
# accommodate, e.g., haddock changes not yet upstream) but not on `master` or
# Marge jobs.
.lint-submods:
<<: *only-default
......
......@@ -527,7 +527,7 @@ parenSymOcc occ doc | isSymOcc occ = parens doc
| otherwise = doc
startsWithUnderscore :: OccName -> Bool
-- ^ Haskell 98 encourages compilers to suppress warnings about unsed
-- ^ Haskell 98 encourages compilers to suppress warnings about unused
-- names in a pattern if they start with @_@: this implements that test
startsWithUnderscore occ = headFS (occNameFS occ) == '_'
......
......@@ -76,7 +76,7 @@ import Control.Monad (foldM)
We have a CFG with edge weights based on which we try to place blocks next to
each other.
Edge weights not only represent likelyhood of control transfer between blocks
Edge weights not only represent likelihood of control transfer between blocks
but also how much a block would benefit from being placed sequentially after
it's predecessor.
For example blocks which are preceded by an info table are more likely to end
......
......@@ -602,7 +602,7 @@ getRegister' _ (CmmMachOp mop [x, y]) -- dyadic PrimOps
_ -> case x of
CmmLit (CmmInt imm _)
| Just _ <- makeImmediate rep True imm
-- subfi ('substract from' with immediate) doesn't exist
-- subfi ('subtract from' with immediate) doesn't exist
-> trivialCode rep True SUBFC y x
_ -> trivialCodeNoImm' (intFormat rep) SUBF y x
......
......@@ -558,7 +558,7 @@ $tab { warnTab }
-- a! b -- a suffix occurrence
--
-- The rules are a bit more elaborate than simply checking for whitespace, in
-- order to accomodate the following use cases:
-- order to accommodate the following use cases:
--
-- f (!a) = ... -- prefix occurrence
-- g (a !) -- loose infix occurrence
......
......@@ -2428,7 +2428,7 @@ tagless final encoding, and there's no need for this complexity.
{- Note [PatBuilder]
~~~~~~~~~~~~~~~~~~~~
Unlike HsExpr or HsCmd, the Pat type cannot accomodate all intermediate forms,
Unlike HsExpr or HsCmd, the Pat type cannot accommodate all intermediate forms,
so we introduce the notion of a PatBuilder.
Consider a pattern like this:
......
......@@ -733,7 +733,7 @@ There are two cases:
from the 'integer' library. These are handled by rule_shift_op,
and match_Integer_shift_op.
Here we could in principle shift by any amount, but we arbitary
Here we could in principle shift by any amount, but we arbitrary
limit the shift to 4 bits; in particular we do not want shift by a
huge amount, which can happen in code like that above.
......
......@@ -1231,7 +1231,7 @@ Why do the instance declarations participate? At least two reasons
the type synonym S. While we know that S depends upon 'Q depends upon Closed,
we have no idea that Closed depends upon Open!
To accomodate for these situations, we ensure that an instance is checked
To accommodate for these situations, we ensure that an instance is checked
before every @TyClDecl@ on which it does not depend. That's to say, instances
are checked as early as possible in @tcTyAndClassDecls@.
......
......@@ -2378,7 +2378,7 @@ pair_fvs (bndr, rhs) = exprSomeFreeVars interesting rhs
interesting :: InterestingVarFun
interesting v = isLocalVar v || (isId v && isDFunId v)
-- Very important: include DFunIds /even/ if it is imported
-- Reason: See Note [Avoiding loops], the second exmaple
-- Reason: See Note [Avoiding loops], the second example
-- involving an imported dfun. We must know whether
-- a dictionary binding depends on an imported dfun,
-- in case we try to specialise that imported dfun
......
......@@ -2369,7 +2369,7 @@ mkAuxBinderName dflags parent occ_fun
{-
Note [Auxiliary binders]
~~~~~~~~~~~~~~~~~~~~~~~~
We often want to make a top-level auxiliary binding. E.g. for comparison we haev
We often want to make a top-level auxiliary binding. E.g. for comparison we have
instance Ord T where
compare a b = $con2tag a `compare` $con2tag b
......
......@@ -158,7 +158,7 @@ type ReduceFn key payload =
Note [reduceNodesIntoVertices implementations]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
reduceNodesIntoVertices is parameterized by the container type.
This is to accomodate key types that don't have an Ord instance
This is to accommodate key types that don't have an Ord instance
and hence preclude the use of Data.Map. An example of such type
would be Unique, there's no way to implement Ord Unique
deterministically.
......
......@@ -121,7 +121,7 @@ to be built with \texttt{CoercionTy}.
laid out in \verb|Note [Invariants on join points]| in
\ghcfile{coreSyn/CoreSyn.hs}:
\begin{enumerate}
\item All occurences must be tail calls. This is enforced in our typing
\item All occurrences must be tail calls. This is enforced in our typing
rules using the label environment $[[D]]$.
\item Each join point has a \emph{join arity}. In this document, we write
each label as $[[p/I_t]]$ for the name $[[p]]$, the type $[[t]]$, and the
......
......@@ -227,7 +227,7 @@ which has evolved from System F to System FC
source-language features of
\emph{GADTs}~\cite{cheney-hinze:phantom-types,sheard:omega,spj+:gadt}
and \emph{type families}~\cite{Kiselyov09funwith,chak+:synonyms}.
The key feature that allows System FC to accomodate GADTs and type
The key feature that allows System FC to accommodate GADTs and type
families is its use of explicit \emph{coercions} that witness the
equality of two syntactically-different types. Coercions are erased
before runtime but, like types, serve as a static consistency
......
......@@ -131,7 +131,7 @@ acts as a pointer to the value on the heap.
\gram{\ottheap}
Execution procedes until a return value (a literal or a variable, i.e.
Execution proceeds until a return value (a literal or a variable, i.e.
pointer to the heap) is produced. To accommodate for let-no-escape
bindings, we also allow execution to terminate with a jump to a function
application of a let-no-escape variable.
......
......@@ -147,7 +147,7 @@ this point in the program,
For this reason we should be cautious when interpreting the source locations
provided by GDB. While these locations will usually be in some sense
"correct", they aren't always useful. This is why profiling tools targetting
"correct", they aren't always useful. This is why profiling tools targeting
Haskell should supplement the standard source location information with
GHC-specific annotations (emitted with ``-g2``) when assigning costs.
......
......@@ -14,7 +14,7 @@ source-repository head
type: git
location: https://gitlab.haskell.org/ghc/ghc
-- To accomodate #16873
-- To accommodate #16873
flag threaded
manual: True
default: True
......
......@@ -51,7 +51,7 @@ libPath Context {..} = buildRoot <&> (-/- (stageString stage -/- "lib"))
-- | Get the directory name for binary distribution files
-- @<arch>-<os>-ghc-<version>@.
--
-- We preform some renaming to accomodate Cabal's slightly different naming
-- We preform some renaming to accommodate Cabal's slightly different naming
-- conventions (see 'cabalOsString' and 'cabalArchString').
distDir :: Stage -> Action FilePath
distDir st = do
......
......@@ -194,7 +194,7 @@ immediate subterms. In the definition of gmapQr, extra effort is
needed. We use a higher-order accumulation trick to mediate between
left-associative constructor application vs. right-associative binary
operation (e.g., @(:)@). When the query is meant to compute a value
of type @r@, then the result type withing generic folding is @r -> r@.
of type @r@, then the result type within generic folding is @r -> r@.
So the result of folding is a function to which we finally pass the
right unit.
......
......@@ -96,7 +96,7 @@ life-cycle it is in:
allocation)
Allocation (in the case of a small request) consists of walking the nursery to
find a page that will accomodate the request. If none exists then we allocate a
find a page that will accommodate the request. If none exists then we allocate a
new nursery page (flushing an existing one to the filled list if the nursery is
full).
......
......@@ -183,7 +183,7 @@ my_mmap (void *addr, W_ size, int operation)
#if defined(darwin_HOST_OS)
// Without MAP_FIXED, Apple's mmap ignores addr.
// With MAP_FIXED, it overwrites already mapped regions, whic
// With MAP_FIXED, it overwrites already mapped regions, which
// mmap(0, ... MAP_FIXED ...) is worst of all: It unmaps the program text
// and replaces it with zeroes, causing instant death.
// This behaviour seems to be conformant with IEEE Std 1003.1-2001.
......
......@@ -743,7 +743,7 @@ GarbageCollect (uint32_t collect_gen,
// oldest_gen->scavenged_large_objects back to oldest_gen->large_objects.
ASSERT(oldest_gen->scavenged_large_objects == NULL);
if (RtsFlags.GcFlags.useNonmoving && major_gc) {
// All threads in non-moving heap should be found to be alive, becuase
// All threads in non-moving heap should be found to be alive, because
// threads in the non-moving generation's list should live in the
// non-moving heap, and we consider non-moving objects alive during
// preparation.
......
......@@ -200,7 +200,7 @@ Mutex concurrent_coll_finished_lock;
* generation.
*
* - Note [Aging under the non-moving collector] (NonMoving.c) describes how
* we accomodate aging
* we accommodate aging
*
* - Note [Large objects in the non-moving collector] (NonMovingMark.c)
* describes how we track large objects.
......
......@@ -406,7 +406,7 @@ freeStorage (bool free_heap)
but can assume only two bits are available in STATIC_LINK (due to 32-bit
systems).
To accomodate this we move handling of static objects entirely to the
To accommodate this we move handling of static objects entirely to the
oldest generation when the nonmoving collector is in use. To do this safely
and efficiently we allocate the blackhole created by lockCAF() directly in
the non-moving heap. This means that the moving collector can completely
......
......@@ -29,7 +29,7 @@ NOT_THESE += jeff-bug lennart_array
# compiles but doesn't run
NOT_THESE += dmgob_native1 dmgob_native2
# Native library doens't exist
# Native library doesn't exist
ifneq "$(HWL_NOFIB_HACK)" ""
NOT_THESE += callback zhang_ccall
......
......@@ -93,7 +93,7 @@
| head tag == '(' && take 2 (reverse tag) == ":)" && length rest > 1 =
getCurrColour `thenP` \ col ->
let
invert Black r = r -- because the move has *already* happend
invert Black r = r -- because the move has *already* happened
invert _ "0.00" = "0.00" -- don't negate 0
invert _ ('-':r) = r
invert _ r = '-':r
......
{-# OPTIONS_GHC -fwarn-unsafe #-}
-- | Basic test to see if Safe warning flags compile
-- Warn if module is infered unsafe
-- Warn if module is inferred unsafe
-- In this test the warning _should_ fire
module SafeFlags22 where
......
{-# OPTIONS_GHC -fwarn-unsafe -Werror #-}
-- | Basic test to see if Safe warning flags compile
-- Warn if module is infered unsafe
-- Warn if module is inferred unsafe
-- In this test the warning _should_ fire and cause a compile fail
module SafeFlags22 where
......
{-# OPTIONS_GHC -fwarn-safe #-}
-- | Basic test to see if Safe warning flags compile
-- Warn if module is infered safe
-- Warn if module is inferred safe
-- In this test the warning _shouldn't_ fire
module SafeFlags23 where
......
{-# OPTIONS_GHC -fwarn-safe #-}
-- | Basic test to see if Safe warning flags compile
-- Warn if module is infered safe
-- Warn if module is inferred safe
-- In this test the warning _should_ fire
module SafeFlags25 where
......
{-# OPTIONS_GHC -fwarn-safe -Werror #-}
-- | Basic test to see if Safe warning flags compile
-- Warn if module is infered safe
-- Warn if module is inferred safe
-- In this test the warning _should_ fire and cause a compile fail
module SafeFlags26 where
......
......@@ -7,14 +7,14 @@ def f( name, opts ):
setTestOpts(f)
# Tests that should compile fine as they should be infered safe
# Tests that should compile fine as they should be inferred safe
test('SafeInfered01', [], multimod_compile, ['SafeInfered01', ''])
test('SafeInfered02', [], multimod_compile, ['SafeInfered02', ''])
test('SafeInfered03', [], multimod_compile, ['SafeInfered03', ''])
test('SafeInfered04', [], multimod_compile, ['SafeInfered04', ''])
test('SafeInfered05', [], multimod_compile, ['SafeInfered05', ''])
# Tests that should fail to compile as they should be infered unsafe
# Tests that should fail to compile as they should be inferred unsafe
test('UnsafeInfered01', [], multimod_compile_fail, ['UnsafeInfered01', ''])
test('UnsafeInfered02', [], multimod_compile_fail, ['UnsafeInfered02', ''])
test('UnsafeInfered03', [], multimod_compile_fail, ['UnsafeInfered03', ''])
......
......@@ -441,7 +441,7 @@ mkPrimCon dt str cr = Constr
{ datatype = dt
, conrep = cr
, constring = str
, confields = error $ concat ["constrFields : ", (tycon dt), " is primative"]
, confields = error $ concat ["constrFields : ", (tycon dt), " is primitive"]
, confixity = error "constrFixity"
}
......
......@@ -152,7 +152,7 @@ ar = AR_TOOL_BIN
-- dll is 2^16-1, however Microsoft's lib.exe for some reason refuses to link
-- up to this amount. The reason is likely that it adds some extra symbols in
-- the generated dll, such as dllmain etc. So we reserve some space in the
-- symbol table to accomodate this. This number is just purely randomly chosen.
-- symbol table to accommodate this. This number is just purely randomly chosen.
#define SYMBOL_PADDING 10
usage :: IO ()
......
......@@ -477,7 +477,7 @@ instance Monoid ModuleSummary where
mappend = (<>)
------------------------------------------------------------------------------
-- global color pallete
-- global color palette
red,green,yellow :: String
red = "#f20913"
......
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