diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2014-11-21 11:20:06 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-11-21 11:26:10 -0600 |
| commit | 7927658ed1dcf557c7dd78e4b9844100521391c8 (patch) | |
| tree | 16a5978453233ba0889af5fa3e59a60b42bc0bfc /ghc | |
| parent | cfa574cea30b411080de5d641309bdf135ed9be5 (diff) | |
| download | haskell-7927658ed1dcf557c7dd78e4b9844100521391c8.tar.gz | |
AST changes to prepare for API annotations, for #9628
Summary:
AST changes to prepare for API annotations
Add locations to parts of the AST so that API annotations can
then be added.
The outline of the whole process is captured here
https://ghc.haskell.org/trac/ghc/wiki/GhcAstAnnotations
This change updates the haddock submodule.
Test Plan: sh ./validate
Reviewers: austin, simonpj, Mikolaj
Reviewed By: simonpj, Mikolaj
Subscribers: thomie, goldfire, carter
Differential Revision: https://phabricator.haskell.org/D426
GHC Trac Issues: #9628
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/InteractiveUI.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 1d4504815c..03a67905a7 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -1948,9 +1948,10 @@ iiSubsumes (IIDecl d1) (IIDecl d2) -- A bit crude && (not (ideclQualified d1) || ideclQualified d2) && (ideclHiding d1 `hidingSubsumes` ideclHiding d2) where - _ `hidingSubsumes` Just (False,[]) = True - Just (False, xs) `hidingSubsumes` Just (False,ys) = all (`elem` xs) ys - h1 `hidingSubsumes` h2 = h1 == h2 + _ `hidingSubsumes` Just (False,L _ []) = True + Just (False, L _ xs) `hidingSubsumes` Just (False,L _ ys) + = all (`elem` xs) ys + h1 `hidingSubsumes` h2 = h1 == h2 iiSubsumes _ _ = False |