comment in front of haddock messes up parsing

[ScamChamp]

This seems to be a problem with the grammar itself, as the code:

-- Comment
-- | Test what
f :: Int

Has the concrete syntax tree of:

(haskell (comment)
 declarations: 
  (declarations
   (signature name: (variable) :: type: (name))))

Here you can see there is no 'haddock' element popping up.

The code:

-- | Test what
f :: Int

Has concrete syntax tree of:

(haskell (haddock)
 declarations: 
  (declarations
   (signature name: (variable) :: type: (name))))

which is correct as it has (haddock).

[dschrempf]

This does not only affect comments in front of Haddock documentation, but also multiline inline Haddock documentation.

For example,

data X =
    A
    -- | The first line of a multiline documentation is labeled (haddock),
    --   but the following lines are just (comment)s!
  | B

(data_type data name: (name) =
 constructors: 
  (data_constructors
   constructor: 
    (data_constructor
     constructor: (prefix name: (constructor)))
   (haddock) (comment) |
   constructor: 
    (data_constructor
     constructor: (prefix name: (constructor)))))

(In particular, have a look at the (haddock) (comment) line).

[tek]

Thanks! Fixed it upstream.