Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
haddock
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
haddock
Commits
61c5729c
Commit
61c5729c
authored
10 years ago
by
Luite Stegeman
Browse files
Options
Downloads
Patches
Plain Diff
ghc 7.8.2 compatibility
parent
a18e0805
No related branches found
Branches containing commit
No related tags found
Tags containing commit
5 merge requests
!38
Make --no-tmp-comp-dir the default
,
!37
Adapt to latest xhtml version, various optimizations
,
!31
Support HsToken in DataDecl and ClassDecl
,
!12
Drop orphan instance when defined upstream.
,
!10
Haddock interfaces produced from `.hi` files
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.travis.yml
+1
-0
1 addition, 0 deletions
.travis.yml
haddock-api/haddock-api.cabal
+1
-1
1 addition, 1 deletion
haddock-api/haddock-api.cabal
src/Haddock/Convert.hs
+10
-1
10 additions, 1 deletion
src/Haddock/Convert.hs
src/Haddock/Interface/Create.hs
+9
-1
9 additions, 1 deletion
src/Haddock/Interface/Create.hs
with
21 additions
and
3 deletions
.travis.yml
+
1
−
0
View file @
61c5729c
language
:
haskell
env
:
-
GHCVER=7.8.2
-
GHCVER=7.8.3
before_install
:
...
...
This diff is collapsed.
Click to expand it.
haddock-api/haddock-api.cabal
+
1
−
1
View file @
61c5729c
...
...
@@ -45,7 +45,7 @@ library
, array
, xhtml >= 3000.2 && < 3000.3
, Cabal >= 1.10
, ghc
==
7.8.
3
, ghc
>= 7.8.2 && <
7.8.
4
, ghc-paths
, haddock-library == 1.1.0.*
...
...
This diff is collapsed.
Click to expand it.
src/Haddock/Convert.hs
+
10
−
1
View file @
61c5729c
{-# LANGUAGE PatternGuards #-}
{-# LANGUAGE
CPP,
PatternGuards #-}
-----------------------------------------------------------------------------
-- |
-- Module : Haddock.Convert
...
...
@@ -94,10 +94,19 @@ tyThingToLHsDecl t = noLoc $ case t of
(
synifyType
ImplicitizeForAll
(
dataConUserType
dc
)))
AConLike
(
PatSynCon
ps
)
->
#
if
MIN_VERSION_ghc
(
7
,
8
,
3
)
let
(
_
,
_
,
req_theta
,
prov_theta
,
_
,
res_ty
)
=
patSynSig
ps
#
else
let
(
_
,
_
,
(
req_theta
,
prov_theta
))
=
patSynSig
ps
#
endif
in
SigD
$
PatSynSig
(
synifyName
ps
)
#
if
MIN_VERSION_ghc
(
7
,
8
,
3
)
(
fmap
(
synifyType
WithinType
)
(
patSynTyDetails
ps
))
(
synifyType
WithinType
res_ty
)
#
else
(
fmap
(
synifyType
WithinType
)
(
patSynTyDetails
ps
))
(
synifyType
WithinType
(
patSynType
ps
))
#
endif
(
synifyCtx
req_theta
)
(
synifyCtx
prov_theta
)
...
...
This diff is collapsed.
Click to expand it.
src/Haddock/Interface/Create.hs
+
9
−
1
View file @
61c5729c
{-# LANGUAGE TupleSections, BangPatterns, LambdaCase #-}
{-# LANGUAGE
CPP,
TupleSections, BangPatterns, LambdaCase #-}
{-# OPTIONS_GHC -Wwarn #-}
-----------------------------------------------------------------------------
-- |
...
...
@@ -366,7 +366,11 @@ classDecls class_ = filterDecls . collectDocs . sortByLoc $ decls
where
decls
=
docs
++
defs
++
sigs
++
ats
docs
=
mkDecls
tcdDocs
DocD
class_
#
if
MIN_VERSION_ghc
(
7
,
8
,
3
)
defs
=
mkDecls
(
bagToList
.
tcdMeths
)
ValD
class_
#
else
defs
=
mkDecls
(
map
snd
.
bagToList
.
tcdMeths
)
ValD
class_
#
endif
sigs
=
mkDecls
tcdSigs
SigD
class_
ats
=
mkDecls
tcdATs
(
TyClD
.
FamDecl
)
class_
...
...
@@ -392,7 +396,11 @@ ungroup group_ =
mkDecls
hs_docs
DocD
group_
++
mkDecls
hs_instds
InstD
group_
++
mkDecls
(
typesigs
.
hs_valds
)
SigD
group_
++
#
if
MIN_VERSION_ghc
(
7
,
8
,
3
)
mkDecls
(
valbinds
.
hs_valds
)
ValD
group_
#
else
mkDecls
(
map
snd
.
valbinds
.
hs_valds
)
ValD
group_
#
endif
where
typesigs
(
ValBindsOut
_
sigs
)
=
filter
isVanillaLSig
sigs
typesigs
_
=
error
"expected ValBindsOut"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment