Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Alex D
GHC
Commits
c78fedde
Commit
c78fedde
authored
Jan 07, 2016
by
Gabor Greif
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Typos in docs and comments
parent
1ee92293
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
15 additions
and
15 deletions
+15
-15
compiler/basicTypes/IdInfo.hs
compiler/basicTypes/IdInfo.hs
+1
-1
compiler/basicTypes/OccName.hs
compiler/basicTypes/OccName.hs
+1
-1
compiler/parser/Parser.y
compiler/parser/Parser.y
+2
-2
compiler/rename/RnSource.hs
compiler/rename/RnSource.hs
+1
-1
compiler/simplCore/SimplUtils.hs
compiler/simplCore/SimplUtils.hs
+2
-2
compiler/typecheck/TcInteract.hs
compiler/typecheck/TcInteract.hs
+1
-1
docs/users_guide/glasgow_exts.rst
docs/users_guide/glasgow_exts.rst
+1
-1
mk/config.mk.in
mk/config.mk.in
+1
-1
mk/warnings.mk
mk/warnings.mk
+4
-4
testsuite/tests/typecheck/should_compile/PolyRec.hs
testsuite/tests/typecheck/should_compile/PolyRec.hs
+1
-1
No files found.
compiler/basicTypes/IdInfo.hs
View file @
c78fedde
...
...
@@ -146,7 +146,7 @@ data IdDetails
-- e.g. $trModule, or $tcT
|
PatSynId
-- ^ A top-level Id to support pattern synonyms;
-- the builder or matcher for the patern synonym
-- the builder or matcher for the pat
t
ern synonym
data
RecSelParent
=
RecSelData
TyCon
|
RecSelPatSyn
PatSyn
deriving
Eq
-- Either `TyCon` or `PatSyn` depending
...
...
compiler/basicTypes/OccName.hs
View file @
c78fedde
...
...
@@ -549,7 +549,7 @@ a user-written type or function name
$f... Dict-fun identifiers (from inst decls)
$dmop Default method for 'op'
$pnC n'th superclass selector for class C
$wf Worker for funct
to
in 'f'
$wf Worker for functi
o
n 'f'
$sf.. Specialised version of f
T:C Tycon for dictionary for class C
D:C Data constructor for dictionary for class C
...
...
compiler/parser/Parser.y
View file @
c78fedde
...
...
@@ -1773,9 +1773,9 @@ varids0 :: { Located [Located RdrName] }
Note [Parsing ~]
~~~~~~~~~~~~~~~~
Due to parsing conflicts between laz
y
ness annotations in data type
Due to parsing conflicts between laz
i
ness annotations in data type
declarations (see strict_mark) and equality types ~'s are always
parsed as laz
y
ness annotations, and turned into HsEqTy's in the
parsed as laz
i
ness annotations, and turned into HsEqTy's in the
correct places using RdrHsSyn.splitTilde.
Since strict_mark is parsed as part of atype which is part of type,
...
...
compiler/rename/RnSource.hs
View file @
c78fedde
...
...
@@ -667,7 +667,7 @@ rnFamInstDecl doc mb_cls tycon (HsIB { hsib_body = pats }) payload rnPayload
(
L
loc
_
:
ps
)
->
combineSrcSpans
loc
(
getLoc
(
last
ps
))
;
pat_kity_vars_with_dups
<-
extractHsTysRdrTyVarsDups
pats
-- Use the "...Dups" form bec
u
ase it's needed
-- Use the "...Dups" form beca
u
se it's needed
-- below to report unsed binder on the LHS
;
var_names
<-
mapM
(
newTyVarNameRn
mb_cls
.
L
loc
.
unLoc
)
$
freeKiTyVarsAllVars
$
...
...
compiler/simplCore/SimplUtils.hs
View file @
c78fedde
...
...
@@ -1023,7 +1023,7 @@ preInlineUnconditionally :: DynFlags -> SimplEnv -> TopLevelFlag -> InId -> InEx
-- Precondition: rhs satisfies the let/app invariant
-- See Note [CoreSyn let/app invariant] in CoreSyn
-- Reason: we don't want to inline single uses, or discard dead bindings,
-- for unlifted, side-effect-ful
l
bindings
-- for unlifted, side-effect-ful bindings
preInlineUnconditionally
dflags
env
top_lvl
bndr
rhs
|
not
active
=
False
|
isStableUnfolding
(
idUnfolding
bndr
)
=
False
-- Note [Stable unfoldings and preInlineUnconditionally]
...
...
@@ -1136,7 +1136,7 @@ postInlineUnconditionally
-- Precondition: rhs satisfies the let/app invariant
-- See Note [CoreSyn let/app invariant] in CoreSyn
-- Reason: we don't want to inline single uses, or discard dead bindings,
-- for unlifted, side-effect-ful
l
bindings
-- for unlifted, side-effect-ful bindings
postInlineUnconditionally
dflags
env
top_lvl
bndr
occ_info
rhs
unfolding
|
not
active
=
False
|
isWeakLoopBreaker
occ_info
=
False
-- If it's a loop-breaker of any kind, don't inline
...
...
compiler/typecheck/TcInteract.hs
View file @
c78fedde
...
...
@@ -593,7 +593,7 @@ we keep? More subtle than you might think!
8% performance improvement in nofib cryptarithm2, compared to
just rolling the dice. I didn't investigate why.
* Constaints coming from the same level (i.e. same implication)
* Const
r
aints coming from the same level (i.e. same implication)
- Always get rid of InstSC ones if possible, since they are less
useful for solving. If both are InstSC, choose the one with
...
...
docs/users_guide/glasgow_exts.rst
View file @
c78fedde
...
...
@@ -8770,7 +8770,7 @@ monomorphic type (one with no foralls). For example,
The definition of ``foo`` is rejected because one would have to
instantiate ``id``\'
s
type
with
``
b
:=
(
forall
s
.
ST
s
a
)
->
a
``,
and
that
is
not
allowed
.
Instanting
polymorpic
type
variables
with
that
is
not
allowed
.
Instanti
ati
ng
polymorp
h
ic
type
variables
with
polymorphic
types
is
called
*
impredicative
polymorphism
*.
GHC
has
extremely
flaky
support
for
*
impredicative
polymorphism
*,
...
...
mk/config.mk.in
View file @
c78fedde
...
...
@@ -440,7 +440,7 @@ SRC_HC_OPTS_STAGE0 =
SRC_HC_OPTS_STAGE1
=
SRC_HC_OPTS_STAGE2
=
# Warning supression flags. See mk/warnings.mk.
# Warning sup
p
ression flags. See mk/warnings.mk.
SRC_CC_WARNING_OPTS
=
SRC_HC_WARNING_OPTS
=
...
...
mk/warnings.mk
View file @
c78fedde
...
...
@@ -123,10 +123,10 @@ GhcBootLibExtraHcOpts += -fno-warn-deprecated-flags
# * Most .cabal files specify -Wall. But not all, and not all building we
# do relies on .cabal files. So we have to add -Wall ourselves somewhere.
#
# * Some .cabal also specify warning supression flags. Because -Wall
# overrides any warning supression flags that come before it, we have to
# make sure -Wall comes before any warning supression flags. So we add it
# * Some .cabal also specify warning sup
p
ression flags. Because -Wall
# overrides any warning sup
p
ression flags that come before it, we have to
# make sure -Wall comes before any warning sup
p
ression flags. So we add it
# to SRC_HC_OPTS.
#
# * Similarly, our own warning supression should come after the -Wall from
# * Similarly, our own warning sup
p
ression should come after the -Wall from
# the .cabal files, so we do *not* add them to SRC_HC_OPTS.
testsuite/tests/typecheck/should_compile/PolyRec.hs
View file @
c78fedde
...
...
@@ -24,6 +24,6 @@ f (Y x) = g maybeToInt x
-- g :: Functor f => (f Int -> b) -> f (Y Maybe) -> b
g
h
x
=
h
$
fmap
f
x
-- 'test' checks that g's type is polymophic enough
-- 'test' checks that g's type is polymo
r
phic enough
test
::
Functor
f
=>
(
f
Int
->
b
)
->
f
(
Y
Maybe
)
->
b
test
=
g
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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