Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
0aafe519
Commit
0aafe519
authored
Feb 15, 2017
by
Gabor Greif
💬
Browse files
Typos in manual, tests and comments
parent
dae50032
Changes
12
Hide whitespace changes
Inline
Side-by-side
compiler/coreSyn/CorePrep.hs
View file @
0aafe519
...
...
@@ -273,7 +273,7 @@ b) The top-level binding is marked NoCafRefs. This really happens
$fApplicativeSTM [NoCafRefs] = D:Alternative sat ...blah...
So, gruesomely, we must set the NoCafRefs flag on the sat bindings,
*and* subst
uti
te the modified 'sat' into the old RHS.
*and* subst
itu
te the modified 'sat' into the old RHS.
It should be the case that 'sat' is itself [NoCafRefs] (a value, no
cafs) else the original top-level binding would not itself have been
...
...
compiler/coreSyn/CoreSyn.hs
View file @
0aafe519
...
...
@@ -1076,7 +1076,7 @@ has two major consequences
instance Eq T where ....
The instance (Eq T) is incorprated as part of T's fingerprint.
In con
s
trast, orphans are all fingerprinted together in the
In contrast, orphans are all fingerprinted together in the
mi_orph_hash field of the ModIface.
See MkIface.addFingerprints.
...
...
compiler/typecheck/TcPatSyn.hs
View file @
0aafe519
...
...
@@ -160,7 +160,7 @@ tcCheckPatSynDecl psb@PSB{ psb_id = lname@(L _ name), psb_args = details
;
traceTc
"tcpatsyn2"
(
vcat
[
ppr
v
<+>
dcolon
<+>
ppr
(
tyVarKind
v
)
|
v
<-
ex_tvs'
])
;
let
prov_theta'
=
substTheta
subst
prov_theta
-- Add univ_tvs to the in_scope set to
-- satisfy the substition invariant. There's no need to
-- satisfy the substit
ut
ion invariant. There's no need to
-- add 'ex_tvs' as they are already in the domain of the
-- substitution.
-- See also Note [The substitution invariant] in TyCoRep.
...
...
compiler/typecheck/TcSMonad.hs
View file @
0aafe519
...
...
@@ -212,7 +212,7 @@ example.
So we arrange to put these particular class constraints in the wl_eqs.
NB: since we do not currently apply the substition to the
NB: since we do not currently apply the substit
ut
ion to the
inert_solved_dicts, the knot-tying still seems a bit fragile.
But this makes it better.
-}
...
...
@@ -795,7 +795,7 @@ Theorem [Stability under extension]
a not in s, OR
the path from the top of s to a includes at least one non-newtype
then the extended substition T = S+(a -fw-> t)
then the extended substit
ut
ion T = S+(a -fw-> t)
is an inert generalised substitution.
Conditions (T1-T3) are established by the canonicaliser
...
...
compiler/typecheck/TcTyClsDecls.hs
View file @
0aafe519
...
...
@@ -1959,7 +1959,7 @@ mkGADTVars tmpl_tvs dc_tvs subst
choose
::
[
TyVar
]
-- accumulator of univ tvs, reversed
->
[
EqSpec
]
-- accumulator of GADT equalities, reversed
->
TCvSubst
-- template subst
uti
tion
->
TCvSubst
-- template subst
itu
tion
->
TCvSubst
-- res. substitution
->
[
TyVar
]
-- template tvs (the univ tvs passed in)
->
(
[
TyVar
]
-- the univ_tvs
...
...
compiler/typecheck/TcType.hs
View file @
0aafe519
...
...
@@ -1479,7 +1479,7 @@ tcRepSplitTyConApp_maybe _ = Nothing
-- currently don't even enough information to fully determine its RuntimeRep
-- variables. For instance, @FunTy (a :: k) Int@.
--
-- By con
s
trast 'tcRepSplitTyConApp_maybe' panics in the second case.
-- By contrast 'tcRepSplitTyConApp_maybe' panics in the second case.
--
-- The behavior here is needed during canonicalization; see Note [FunTy and
-- decomposing tycon applications] in TcCanonical for details.
...
...
compiler/types/TyCon.hs
View file @
0aafe519
...
...
@@ -1732,7 +1732,7 @@ isInjectiveTyCon tc@(TcTyCon {}) _
isGenerativeTyCon
::
TyCon
->
Role
->
Bool
isGenerativeTyCon
(
FamilyTyCon
{
famTcFlav
=
DataFamilyTyCon
_
})
Nominal
=
True
isGenerativeTyCon
(
FamilyTyCon
{})
_
=
False
-- in all other cases, injectivity implies generativit
i
y
-- in all other cases, injectivity implies generativity
isGenerativeTyCon
tc
r
=
isInjectiveTyCon
tc
r
-- | Is this an 'AlgTyConRhs' of a 'TyCon' that is generative and injective
...
...
compiler/types/Unify.hs
View file @
0aafe519
...
...
@@ -504,7 +504,7 @@ To make it idempotent we don't want to get just
We also want to substitute inside f's kind, to get
[ k -> *
, g -> H k (f:*) ]
If we don't do this, we may apply the substit
i
tion to something,
If we don't do this, we may apply the substit
u
tion to something,
and get an ill-formed type, i.e. one where typeKind will fail.
This happened, for example, in Trac #9106.
...
...
docs/users_guide/ghci.rst
View file @
0aafe519
...
...
@@ -2153,7 +2153,7 @@ commonly used commands.
If
omitted
,
⟨
n
⟩
and
⟨
m
⟩
default
to
the
first
or
last
available
completion
candidate
respectively
.
If
there
are
less
candidates
than
requested
via
the
range
argument
,
⟨
n
⟩
and
⟨
m
⟩
are
implicitly
capped
to
the
number
of
available
completi
ti
on
candidates
.
to
the
number
of
available
completion
candidates
.
The
output
of
:
ghci
-
cmd
:`:
complete
`
begins
with
a
header
line
containing
three
space
-
delimited
fields
:
...
...
testsuite/tests/indexed-types/should_fail/T4485.hs
View file @
0aafe519
...
...
@@ -48,7 +48,7 @@ data FooBar = FooBar
instance
{-# OVERLAPPING #-}
EmbedAsChild
(
IdentityT
IO
)
FooBar
where
asChild
b
=
asChild
$
(
genElement
"foo"
)
-- asChild :: FooBar -> XMLGenT (XMLGenT (IdentityT IO) [Child (Identit
i
yT IO)])
-- asChild :: FooBar -> XMLGenT (XMLGenT (IdentityT IO) [Child (IdentityT IO)])
{- ---------- Deriving the constraints ----------
asChild :: EmbedAsChild m c => c -> XMLGenT m [Child m]
...
...
testsuite/tests/programs/andy_cherry/andy_cherry.stdout
View file @
0aafe519
...
...
@@ -7153,7 +7153,7 @@ $$\showboard$$
18
&
\ldots
&
N*g2??
\\
\end{tabular}
}
|
\end{center}
Throws away a piece for a very temp. inititive.
Throws away a piece for a very temp. initi
a
tive.
|18
\ldots
~Rb8; 19.~d4, e*d4; 20.~c*d4, Ne6; 21.~N*e6, Q*e6|
and white is starting to push home his advantage.
\begin{center}
|
...
...
testsuite/tests/programs/andy_cherry/mygames.pgn
View file @
0aafe519
...
...
@@ -1307,7 +1307,7 @@ Qd6 15. h3 Be6 16. Ng5 Bxb3 17. axb3 Nf4 18. Nf3 {<sab>}) 15. Nxc5 Qc8 (
16. b4 {White is just a pawn up.}) 16... Rd8 17. Qd2 Rd6 (17... Bxf3 {!}
18. Rxf3 Qg4 19. Rxf4 exf4 20. h3 Qh4 21. d4 {and black has equalised!})
18. Bd1 {} 18... Nxg2 {?? Throws away a piece for a very temp.
inititive.} (18... Rb8 19. d4 exd4 20. cxd4 Ne6 21. Nxe6 Qxe6 {and white
initi
a
tive.} (18... Rb8 19. d4 exd4 20. cxd4 Ne6 21. Nxe6 Qxe6 {and white
is starting to push home his advantage.}) 19. Kxg2 Bh3+ 20. Kh1 Qg4 (
20... Rg6 {is another idea, but the whole plan is conceptually flawed.})
21. Ne1 Qg5 22. Qe2 Be6 23. Rg3 Qf6 24. Nxe6 {} (24. Nf3 Ne7 25. Nxe6
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment