diff options
| author | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-05-12 13:26:03 +0200 |
|---|---|---|
| committer | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-05-12 13:26:03 +0200 |
| commit | 1b381af863d64aaa0a4dd9c816170c58e6131a9e (patch) | |
| tree | 52fa1f1af2d5256e5f475e3c6dd00630d53fb35d /compiler/parser | |
| parent | c25b934ef544fa3eba0a9f9da41b363c470156cb (diff) | |
| parent | c8c2f6bb7d79a2a6aeaa3233363fdf0bbbfad205 (diff) | |
| download | haskell-1b381af863d64aaa0a4dd9c816170c58e6131a9e.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Resolved conflicts:
compiler/typecheck/TcTyClsDecls.lhs
Diffstat (limited to 'compiler/parser')
| -rw-r--r-- | compiler/parser/ParserCore.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/parser/ParserCore.y b/compiler/parser/ParserCore.y index 8bf94539fa..3f2b32a8b3 100644 --- a/compiler/parser/ParserCore.y +++ b/compiler/parser/ParserCore.y @@ -269,7 +269,7 @@ exp :: { IfaceExpr } | '%let' let_bind '%in' exp { IfaceLet $2 $4 } -- gaw 2004 | '%case' '(' ty ')' aexp '%of' id_bndr - '{' alts1 '}' { IfaceCase $5 (fst $7) $3 $9 } + '{' alts1 '}' { IfaceCase $5 (fst $7) $9 } | '%cast' aexp aty { IfaceCast $2 $3 } -- No InlineMe any more -- | '%note' STRING exp |