[commit: ghc] wip/T11028: Refactor ConDecl (410b647)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/410b6477ce9396555900b46f740515a432171524/ghc

>---------------------------------------------------------------

commit 410b6477ce9396555900b46f740515a432171524
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 23 22:59:27 2015 +0200

    Refactor ConDecl
    
    The ConDecl type in HsDecls is an uneasy compromise. For the most part,
    HsSyn directly reflects the syntax written by the programmer; and that
    gives just the right "pegs" on which to hang Alan's API annotations. But
    ConDecl doesn't properly reflect the syntax of Haskell-98 and GADT-style
    data type declarations.
    
    To be concrete, here's a draft new data type
    
    data ConDecl name
      | ConDeclGADT
          { con_names   :: [Located name]
          , con_type    :: LHsSigType name  -- The type after the ‘::’
          , con_doc     :: Maybe LHsDocString }
    
      | ConDeclH98
          { con_name    :: Located name
    
          , con_qvars     :: Maybe (LHsQTyVars name)
            -- User-written forall (if any), and its implicit
            -- kind variables
            -- Non-Nothing needs -XExistentialQuantification
    
          , con_cxt       :: Maybe (LHsContext name)
            -- ^ User-written context (if any)
    
          , con_details   :: HsConDeclDetails name
              -- ^ Arguments
    
          , con_doc       :: Maybe LHsDocString
              -- ^ A possible Haddock comment.
          } deriving (Typeable)
    
    Note that
    
        For GADTs, just keep a type. That's what the user writes.
        NB:HsType can represent records on the LHS of an arrow:
    
          { x:Int,y:Bool} -> T
    
        con_qvars and con_cxt are both Maybe because they are both
        optional (the forall and the context of an existential data type
    
        For ConDeclGADT the type variables of the data type do not scope
        over the con_type; whereas for ConDeclH98 they do scope over con_cxt
        and con_details.
    
    Trac issue: #11028


>---------------------------------------------------------------

410b6477ce9396555900b46f740515a432171524
 compiler/deSugar/DsMeta.hs                         |  89 ++++++++--
 compiler/hsSyn/Convert.hs                          |  17 +-
 compiler/hsSyn/HsDecls.hs                          | 133 +++++---------
 compiler/hsSyn/HsTypes.hs                          |   4 +-
 compiler/hsSyn/HsUtils.hs                          |  19 +-
 compiler/parser/Parser.y                           |  12 +-
 compiler/parser/RdrHsSyn.hs                        |  72 +++-----
 compiler/rename/RnEnv.hs                           |   4 +-
 compiler/rename/RnNames.hs                         |  11 +-
 compiler/rename/RnSource.hs                        | 120 +++++--------
 compiler/rename/RnTypes.hs                         |  22 ++-
 compiler/typecheck/TcHsType.hs                     |   9 +-
 compiler/typecheck/TcRnDriver.hs                   |   2 +-
 compiler/typecheck/TcTyClsDecls.hs                 | 191 +++++++++++++++------
 testsuite/tests/ghc-api/annotations/T10399.stdout  |   2 -
 testsuite/tests/ghc-api/annotations/all.T          |   2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout |   2 +-
 testsuite/tests/rename/should_compile/T5331.stderr |   2 +-
 testsuite/tests/rename/should_fail/T7943.stderr    |   6 +-
 utils/haddock                                      |   2 +-
 20 files changed, 391 insertions(+), 330 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 410b6477ce9396555900b46f740515a432171524