Ticket #43: haddock-gadt.diff

compiler/hsSyn/HsDecls.lhs

@@ -789 +789 @@
 
 pprConDecl (ConDecl { con_name = con, con_explicit = expl, con_qvars = tvs
                     , con_cxt = cxt, con_details = PrefixCon arg_tys
-                    , con_res = ResTyGADT res_ty })
-  = ppr con <+> dcolon <+> 
+                    , con_res = ResTyGADT res_ty, con_doc = doc })
+  = maybe empty ppr doc <+> ppr con <+> dcolon <+> 
     sep [pprHsForAll expl tvs cxt, ppr (foldr mk_fun_ty res_ty arg_tys)]
   where
     mk_fun_ty a b = noLoc (HsFunTy a b)

compiler/parser/Parser.y.pp

@@ -1191 +1191 @@
 -- Datatype declarations
 
 gadt_constrlist :: { Located [LConDecl RdrName] }       -- Returned in order
-        : 'where' '{'        gadt_constrs '}'      { L (comb2 $1 $3) (unLoc $3) }
-        | 'where' vocurly    gadt_constrs close    { L (comb2 $1 $3) (unLoc $3) }
+        : 'where' '{'        maybe_docnext gadt_constrs '}'
+          { L (comb2 $1 $5) (addConDocFirst (unLoc $4) $3) }
+        | 'where' vocurly    maybe_docnext optSemi gadt_constrs close
+          { L (comb2 $1 $5) (addConDocFirst (unLoc $5) $3) }
         | {- empty -}                              { noLoc [] }
 
 gadt_constrs :: { Located [LConDecl RdrName] }
-        : gadt_constr ';' gadt_constrs  { L (comb2 (head $1) $3) ($1 ++ unLoc $3) }
-        | gadt_constr                   { L (getLoc (head $1)) $1 }
+        : gadt_constr ';' maybe_docprev optSemi maybe_docnext optSemi gadt_constrs 
+             { L (comb2 (head $1) $7) (addConDocs $1 $3 ++ addConDocFirst (unLoc $7) $5) }
+        | gadt_constr maybe_docprev     { L (getLoc (head $1)) $ addConDocFirst $1 $2 }
         | {- empty -}                   { noLoc [] }
 
 -- We allow the following forms:

rules/hs-suffix-rules-srcdir.mk

@@ -21 +21 @@
 ifneq "$$(BootingFromHc)" "YES"
 
 $1/$2/build/%.hs : $1/$4/%.ly | $$$$(dir $$$$@)/.
-        $$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
+        $$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@ --info=$$@.i
 
 $1/$2/build/%.hs : $1/$4/%.y | $$$$(dir $$$$@)/.
-        $$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
+        $$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@ --info=$$@.i
 
 $1/$2/build/%.hs : $1/$4/%.x | $$$$(dir $$$$@)/.
         $$(call cmd,ALEX) $$($1_$2_$3_ALL_ALEX_OPTS) $$< -o $$@