Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f0d10e348d29c19a439d921dfbfb0c66a02f6b75

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

commit f0d10e348d29c19a439d921dfbfb0c66a02f6b75
Author: Paolo Capriotti <[email protected]>
Date:   Fri Apr 6 15:01:01 2012 +0100

    Allow promoted constructors in the typedoc production (#5948)

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

 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 9774c24..fc6a950 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 }



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to