diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-04-13 21:42:29 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-04-13 21:42:29 +0100 |
| commit | 49d061574206409b9d5bee3ed88e22e55a3e700d (patch) | |
| tree | 2f8ef785a9239acf8106c1e5bbdee04c599c1412 /compiler/parser | |
| parent | c5554f8290f5acc5f52ab1ea6488a75d0ffa34e5 (diff) | |
| parent | 3377abeb6bd4623c5806936d0ee569d123c1aa59 (diff) | |
| download | haskell-49d061574206409b9d5bee3ed88e22e55a3e700d.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org//ghc
Diffstat (limited to 'compiler/parser')
| -rw-r--r-- | compiler/parser/Parser.y.pp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp index 5fd0e9de76..dd842849e7 100644 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp @@ -1053,6 +1053,9 @@ typedoc :: { LHsType RdrName } | btype '->' ctypedoc { LL $ HsFunTy $1 $3 } | btype docprev '->' ctypedoc { LL $ HsFunTy (L (comb2 $1 $2) (HsDocTy $1 $2)) $4 } | btype '~' btype { LL $ HsEqTy $1 $3 } + -- see Note [Promotion] + | btype SIMPLEQUOTE qconop type { LL $ mkHsOpTy $1 $3 $4 } + | btype SIMPLEQUOTE varop type { LL $ mkHsOpTy $1 $3 $4 } btype :: { LHsType RdrName } : btype atype { LL $ HsAppTy $1 $2 } |