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
ab0743f8
Commit
ab0743f8
authored
Apr 03, 2015
by
thomie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comments only, mostly typos
[skip ci]
parent
fd1099cb
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
11 deletions
+13
-11
compiler/hsSyn/HsExpr.hs
compiler/hsSyn/HsExpr.hs
+1
-1
compiler/main/GhcMake.hs
compiler/main/GhcMake.hs
+1
-1
compiler/simplCore/SimplMonad.hs
compiler/simplCore/SimplMonad.hs
+1
-1
compiler/types/TypeRep.hs
compiler/types/TypeRep.hs
+3
-3
ghc.mk
ghc.mk
+3
-3
testsuite/tests/th/all.T
testsuite/tests/th/all.T
+1
-1
utils/ghc-pkg/Main.hs
utils/ghc-pkg/Main.hs
+3
-1
No files found.
compiler/hsSyn/HsExpr.hs
View file @
ab0743f8
...
...
@@ -772,7 +772,7 @@ However, some code is internally generated, and in some places
parens are absolutely required; so for these places we use
pprParendExpr (but don't print double parens of course).
For operator applications we don't add parens, because the op
r
erator
For operator applications we don't add parens, because the operator
fixities should do the job, except in debug mode (-dppr-debug) so we
can see the structure of the parse tree.
-}
...
...
compiler/main/GhcMake.hs
View file @
ab0743f8
...
...
@@ -97,7 +97,7 @@ label_self thread_name = do
--
-- Note that each 'ModSummary' in the module graph caches its 'DynFlags'.
-- These 'DynFlags' are determined by the /current/ session 'DynFlags' and the
-- @OPTIONS@ and @LANGUAGE@ pragmas of the parsed module. Thus if you want
to
-- @OPTIONS@ and @LANGUAGE@ pragmas of the parsed module. Thus if you want
-- changes to the 'DynFlags' to take effect you need to call this function
-- again.
--
...
...
compiler/simplCore/SimplMonad.hs
View file @
ab0743f8
...
...
@@ -91,7 +91,7 @@ computeMaxTicks dflags size
-- MAGIC NUMBER, multiplies the simplTickFactor
-- We can afford to be generous; this is really
-- just checking for loops, and shouldn't usually fire
-- A figure of 20 was too small: see Trac #553
-- A figure of 20 was too small: see Trac #553
9.
{-# INLINE thenSmpl #-}
{-# INLINE thenSmpl_ #-}
...
...
compiler/types/TypeRep.hs
View file @
ab0743f8
...
...
@@ -98,7 +98,7 @@ import qualified Data.Data as Data hiding ( TyCon )
data
Type
=
TyVarTy
Var
-- ^ Vanilla type or kind variable (*never* a coercion variable)
|
AppTy
-- See Note [AppTy
invariant
]
|
AppTy
-- See Note [AppTy
rep
]
Type
Type
-- ^ Type application to something other than a 'TyCon'. Parameters:
--
...
...
@@ -107,10 +107,10 @@ data Type
--
-- 2) Argument type
|
TyConApp
-- See Note [AppTy
invariant
]
|
TyConApp
-- See Note [AppTy
rep
]
TyCon
[
KindOrType
]
-- ^ Application of a 'TyCon', including newtypes /and/ synonyms.
-- Invariant: saturated appliations of 'FunTyCon' must
-- Invariant: saturated appli
c
ations of 'FunTyCon' must
-- use 'FunTy' and saturated synonyms must use their own
-- constructors. However, /unsaturated/ 'FunTyCon's
-- do appear as 'TyConApp's.
...
...
ghc.mk
View file @
ab0743f8
...
...
@@ -49,18 +49,18 @@
# o Build utils/ghc-pkg
# o Build utils/hsc2hs
# * For each package:
# o configure, generate package-data.mk and inplace-pkg-
info
# o configure, generate package-data.mk and inplace-pkg-
config
# o register each package into inplace/lib/package.conf
# * build libffi (if not disabled by --with-system-libffi)
# * With bootstrapping compiler:
# o Build libraries/{filepath,hpc,Cabal}
# o Build compiler (stage 1)
# * With stage 1:
# * With stage 1
compiler
:
# o Build libraries/*
# o Build rts
# o Build utils/* (except haddock)
# o Build compiler (stage 2)
# * With stage 2:
# * With stage 2
compiler
:
# o Build utils/haddock
# o Build compiler (stage 3) (optional)
# * With haddock:
...
...
testsuite/tests/th/all.T
View file @
ab0743f8
# This test needs to come before the setTestOpts calls below, as we want
# to run it if
!
compiler_profiled
# to run it if compiler_profiled
.
test
('
T4255
',
unless
(
compiler_profiled
(),
skip
),
compile_fail
,
['
-v0
'])
def
f
(
name
,
opts
):
...
...
utils/ghc-pkg/Main.hs
View file @
ab0743f8
...
...
@@ -325,7 +325,7 @@ data PackageArg
-- match a single entry in the package database.
|
IPId
InstalledPackageId
-- | A glob against the package name. The first string is the literal
-- glob, the second is a function which returns @True@ if the
the
argument
-- glob, the second is a function which returns @True@ if the argument
-- matches.
|
Substring
String
(
String
->
Bool
)
...
...
@@ -2023,5 +2023,7 @@ removeFileSafe fn =
removeFile
fn
`
catchIO
`
\
e
->
when
(
not
$
isDoesNotExistError
e
)
$
ioError
e
-- | Turn a path relative to the current directory into a (normalised)
-- absolute path.
absolutePath
::
FilePath
->
IO
FilePath
absolutePath
path
=
return
.
normalise
.
(
</>
path
)
=<<
getCurrentDirectory
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