X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2FParser.y;h=11dc6dc7a42f93046854971e1e94e0b140f1b957;hb=d28ba8c800901bea01f70c4719278c2a364cf9fc;hp=a30599526ad80099fdaca540154dfc481ae73632;hpb=56b5a8b862d4eaeeaa941dd53e3d1009bdeadc0d;p=ghc-hetmet.git diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index a305995..11dc6dc 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ {- -*-haskell-*- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.116 2003/02/20 18:33:53 simonpj Exp $ +$Id: Parser.y,v 1.119 2003/06/23 10:35:22 simonpj Exp $ Haskell grammar. @@ -265,10 +265,9 @@ REIFY_FIXITY { ITreifyFixity } module :: { RdrNameHsModule } : srcloc 'module' modid maybemoddeprec maybeexports 'where' body - { HsModule (mkHomeModule $3) Nothing $5 (fst $7) (snd $7) $4 $1 } + { HsModule (Just (mkHomeModule $3)) $5 (fst $7) (snd $7) $4 $1 } | srcloc body - { HsModule (mkHomeModule mAIN_Name) Nothing Nothing - (fst $2) (snd $2) Nothing $1 } + { HsModule Nothing Nothing (fst $2) (snd $2) Nothing $1 } maybemoddeprec :: { Maybe DeprecTxt } : '{-# DEPRECATED' STRING '#-}' { Just $2 } @@ -443,7 +442,7 @@ tycl_decl :: { RdrNameTyClDecl } { let (binds,sigs) = cvMonoBindsAndSigs $5 in - mkClassDecl $3 $4 (map cvClassOpSig sigs) (Just binds) $1 } + mkClassDecl $3 $4 sigs (Just binds) $1 } syn_hdr :: { (RdrName, [RdrNameHsTyVar]) } -- We don't retain the syntax of an infix -- type synonym declaration. Oh well.