diff options
| author | Matthew Yacavone <matthew@yacavone.net> | 2018-10-27 14:01:42 -0400 |
|---|---|---|
| committer | Richard Eisenberg <rae@cs.brynmawr.edu> | 2018-10-27 14:54:56 -0400 |
| commit | 512eeb9bb9a81e915bfab25ca16bc87c62252064 (patch) | |
| tree | 803e752c6907fdfc89a5f71e6bfda04d7ef86bea /compiler/deSugar/Match.hs | |
| parent | 23956b2ada690c78a134fe6d149940c777c7efcc (diff) | |
| download | haskell-512eeb9bb9a81e915bfab25ca16bc87c62252064.tar.gz | |
More explicit foralls (GHC Proposal 0007)
Allow the user to explicitly bind type/kind variables in type and data
family instances (including associated instances), closed type family
equations, and RULES pragmas. Follows the specification of GHC
Proposal 0007, also fixes #2600. Advised by Richard Eisenberg.
This modifies the Template Haskell AST -- old code may break!
Other Changes:
- convert HsRule to a record
- make rnHsSigWcType more general
- add repMaybe to DsMeta
Includes submodule update for Haddock.
Test Plan: validate
Reviewers: goldfire, bgamari, alanz
Subscribers: simonpj, RyanGlScott, goldfire, rwbarton,
thomie, mpickering, carter
GHC Trac Issues: #2600, #14268
Differential Revision: https://phabricator.haskell.org/D4894
Diffstat (limited to 'compiler/deSugar/Match.hs')
| -rw-r--r-- | compiler/deSugar/Match.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/deSugar/Match.hs b/compiler/deSugar/Match.hs index ec982f6b25..e4a8bad525 100644 --- a/compiler/deSugar/Match.hs +++ b/compiler/deSugar/Match.hs @@ -402,7 +402,7 @@ tidy1 :: Id -- The Id being scrutinised -- list patterns, etc) and returns any created bindings in the wrapper. tidy1 v (ParPat _ pat) = tidy1 v (unLoc pat) -tidy1 v (SigPat _ pat) = tidy1 v (unLoc pat) +tidy1 v (SigPat _ pat _) = tidy1 v (unLoc pat) tidy1 _ (WildPat ty) = return (idDsWrapper, WildPat ty) tidy1 v (BangPat _ (L l p)) = tidy_bang_pat v l p @@ -480,7 +480,7 @@ tidy_bang_pat :: Id -> SrcSpan -> Pat GhcTc -> DsM (DsWrapper, Pat GhcTc) -- Discard par/sig under a bang tidy_bang_pat v _ (ParPat _ (L l p)) = tidy_bang_pat v l p -tidy_bang_pat v _ (SigPat _ (L l p)) = tidy_bang_pat v l p +tidy_bang_pat v _ (SigPat _ (L l p) _) = tidy_bang_pat v l p -- Push the bang-pattern inwards, in the hope that -- it may disappear next time |