diff options
| author | simonmar <unknown> | 2002-05-27 09:03:52 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2002-05-27 09:03:52 +0000 |
| commit | a4e4c5f822416dbe2b8abe34301e8d3e39051bc1 (patch) | |
| tree | 48743b04e3ebced1288b7ee51700f01fb4d02fa3 /src/HsParser.ly | |
| parent | 01c2ddd27ae8776b03464d091d6dce989b7ee13f (diff) | |
[haddock @ 2002-05-27 09:03:51 by simonmar]
Lots of changes:
- instances of a class are listed with the class, and
instances involving a datatype are listed with that type.
Derived instances aren't included at the moment: the calculation
to find the instance head for a derived instance is non-trivial.
- some formatting changes; use rows with specified height rather than
cellspacing in some places.
- various fixes (source file links were wrong, amongst others)
Diffstat (limited to 'src/HsParser.ly')
| -rw-r--r-- | src/HsParser.ly | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/HsParser.ly b/src/HsParser.ly index 9b47f117..4c12adc7 100644 --- a/src/HsParser.ly +++ b/src/HsParser.ly @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- -$Id: HsParser.ly,v 1.11 2002/05/15 13:03:02 simonmar Exp $ +$Id: HsParser.ly,v 1.12 2002/05/27 09:03:52 simonmar Exp $ (c) Simon Marlow, Sven Panne 1997-2002 @@ -306,7 +306,8 @@ shift/reduce-conflict, so we don't handle this case here, but in bodyaux. > | 'class' srcloc ctype fds optcbody > { HsClassDecl $2 $3 $4 $5 Nothing} > | 'instance' srcloc ctype optvaldefs -> { HsInstDecl $2 $3 $4 } +> {% checkInstHeader $3 `thenP` \(ctxt,asst) -> +> returnP (HsInstDecl $2 ctxt asst $4) } > | 'default' srcloc '(' typelist ')' > { HsDefaultDecl $2 $4 } > | 'foreign' fdecl { $2 } |