X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=0a8b0b6eec3ffebb34283575fd592a83c7d8b013;hb=ac9c1e5de9629103a125e0515dcee2466ff898a7;hp=da0082567ca4b8b860ae88e8183588eec218731f;hpb=afef39736dcde6f4947a6f362f9e6b3586933db4;p=ghc-hetmet.git diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp index da00825..0a8b0b6 100644 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp @@ -113,6 +113,7 @@ and LL. Each of these macros can be thought of as having type They each add a SrcSpan to their argument. L0 adds 'noSrcSpan', used for empty productions + -- This doesn't seem to work anymore -=chak L1 for a production with a single token on the lhs. Grabs the SrcSpan from that token. @@ -175,7 +176,7 @@ incorrect. 'where' { L _ ITwhere } '_scc_' { L _ ITscc } -- ToDo: remove - 'forall' { L _ ITforall } -- GHC extension keywords + 'forall' { L _ ITforall } -- GHC extension keywords 'foreign' { L _ ITforeign } 'export' { L _ ITexport } 'label' { L _ ITlabel } @@ -184,6 +185,8 @@ incorrect. 'threadsafe' { L _ ITthreadsafe } 'unsafe' { L _ ITunsafe } 'mdo' { L _ ITmdo } + 'iso' { L _ ITiso } + 'family' { L _ ITfamily } 'stdcall' { L _ ITstdcallconv } 'ccall' { L _ ITccallconv } 'dotnet' { L _ ITdotnet } @@ -442,7 +445,7 @@ topdecls :: { OrdList (LHsDecl RdrName) } topdecl :: { OrdList (LHsDecl RdrName) } : cl_decl { unitOL (L1 (TyClD (unLoc $1))) } - | ty_decl {% checkTopTyClD $1 >>= return.unitOL.L1 } + | ty_decl { unitOL (L1 (TyClD (unLoc $1))) } | 'instance' inst_type where { let (binds, sigs, ats) = cvBindsAndSigs (unLoc $3) in unitOL (L (comb3 $1 $2 $3) @@ -465,8 +468,9 @@ cl_decl :: { LTyClDecl RdrName } : 'class' tycl_hdr fds where {% do { let { (binds, sigs, ats) = cvBindsAndSigs (unLoc $4) - ; (ctxt, tc, tvs, Just tparms) = unLoc $2} - ; checkTyVars tparms + ; (ctxt, tc, tvs, tparms) = unLoc $2} + ; checkTyVars tparms -- only type vars allowed + ; checkKindSigs ats ; return $ L (comb4 $1 $2 $3 $4) (mkClassDecl (ctxt, tc, tvs) (unLoc $3) sigs binds ats) } } @@ -474,27 +478,96 @@ cl_decl :: { LTyClDecl RdrName } -- Type declarations -- ty_decl :: { LTyClDecl RdrName } - : 'type' type '=' ctype - -- Note type on the left of the '='; this allows - -- infix type constructors to be declared - -- - -- Note ctype, not sigtype, on the right + -- ordinary type synonyms + : 'type' type '=' ctype + -- Note ctype, not sigtype, on the right of '=' -- We allow an explicit for-all but we don't insert one -- in type Foo a = (b,b) -- Instead we just say b is out of scope - {% do { (tc,tvs) <- checkSynHdr $2 - ; return (LL (TySynonym tc tvs $4)) } } - + -- + -- Note the use of type for the head; this allows + -- infix type constructors to be declared + {% do { (tc, tvs, _) <- checkSynHdr $2 False + ; return (L (comb2 $1 $4) + (TySynonym tc tvs Nothing $4)) + } } + + -- type family declarations + | 'type' 'family' opt_iso type '::' kind + -- Note the use of type for the head; this allows + -- infix type constructors to be declared + -- + {% do { (tc, tvs, _) <- checkSynHdr $4 False + ; return (L (comb3 $1 $4 $6) + (TyFunction tc tvs $3 (unLoc $6))) + } } + + -- type instance declarations + | 'type' 'instance' type '=' ctype + -- Note the use of type for the head; this allows + -- infix type constructors and type patterns + -- + {% do { (tc, tvs, typats) <- checkSynHdr $3 True + ; return (L (comb2 $1 $5) + (TySynonym tc tvs (Just typats) $5)) + } } + + -- ordinary data type or newtype declaration | data_or_newtype tycl_hdr constrs deriving - { L (comb4 $1 $2 $3 $4) -- We need the location on tycl_hdr - -- in case constrs and deriving are both empty - (mkTyData (unLoc $1) (unLoc $2) Nothing (reverse (unLoc $3)) (unLoc $4)) } - + {% do { let {(ctxt, tc, tvs, tparms) = unLoc $2} + ; checkTyVars tparms -- no type pattern + ; return $ + L (comb4 $1 $2 $3 $4) + -- We need the location on tycl_hdr in case + -- constrs and deriving are both empty + (mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing) + Nothing (reverse (unLoc $3)) (unLoc $4)) } } + + -- ordinary GADT declaration | data_or_newtype tycl_hdr opt_kind_sig 'where' gadt_constrlist deriving - { L (comb4 $1 $2 $4 $5) - (mkTyData (unLoc $1) (unLoc $2) $3 (reverse (unLoc $5)) (unLoc $6)) } + {% do { let {(ctxt, tc, tvs, tparms) = unLoc $2} + ; checkTyVars tparms -- can have type pats + ; return $ + L (comb4 $1 $2 $4 $5) + (mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing) $3 + (reverse (unLoc $5)) (unLoc $6)) } } + + -- data/newtype family + | data_or_newtype 'family' tycl_hdr '::' kind + {% do { let {(ctxt, tc, tvs, tparms) = unLoc $3} + ; checkTyVars tparms -- no type pattern + ; return $ + L (comb3 $1 $2 $5) + (mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing) + (Just (unLoc $5)) [] Nothing) } } + + -- data/newtype instance declaration + | data_or_newtype 'instance' tycl_hdr constrs deriving + {% do { let {(ctxt, tc, tvs, tparms) = unLoc $3} + -- can have type pats + ; return $ + L (comb4 $1 $3 $4 $5) + -- We need the location on tycl_hdr in case + -- constrs and deriving are both empty + (mkTyData (unLoc $1) (ctxt, tc, tvs, Just tparms) + Nothing (reverse (unLoc $4)) (unLoc $5)) } } + + -- GADT instance declaration + | data_or_newtype 'instance' tycl_hdr opt_kind_sig + 'where' gadt_constrlist + deriving + {% do { let {(ctxt, tc, tvs, tparms) = unLoc $3} + -- can have type pats + ; return $ + L (comb4 $1 $3 $6 $7) + (mkTyData (unLoc $1) (ctxt, tc, tvs, Just tparms) + $4 (reverse (unLoc $6)) (unLoc $7)) } } + +opt_iso :: { Bool } + : { False } + | 'iso' { True } data_or_newtype :: { Located NewOrData } : 'data' { L1 DataType } @@ -502,9 +575,9 @@ data_or_newtype :: { Located NewOrData } opt_kind_sig :: { Maybe Kind } : { Nothing } - | '::' kind { Just $2 } + | '::' kind { Just (unLoc $2) } --- tycl_hdr parses the header of a type decl, +-- tycl_hdr parses the header of a class or data type decl, -- which takes the form -- T a b -- Eq a => T a @@ -514,7 +587,7 @@ opt_kind_sig :: { Maybe Kind } tycl_hdr :: { Located (LHsContext RdrName, Located RdrName, [LHsTyVarBndr RdrName], - Maybe [LHsType RdrName]) } + [LHsType RdrName]) } : context '=>' type {% checkTyClHdr $1 $3 >>= return.LL } | type {% checkTyClHdr (noLoc []) $1 >>= return.L1 } @@ -719,7 +792,7 @@ atype :: { LHsType RdrName } | '[' ctype ']' { LL $ HsListTy $2 } | '[:' ctype ':]' { LL $ HsPArrTy $2 } | '(' ctype ')' { LL $ HsParTy $2 } - | '(' ctype '::' kind ')' { LL $ HsKindSig $2 $4 } + | '(' ctype '::' kind ')' { LL $ HsKindSig $2 (unLoc $4) } -- Generics | INTEGER { L1 (HsNumTy (getINTEGER $1)) } @@ -748,7 +821,8 @@ tv_bndrs :: { [LHsTyVarBndr RdrName] } tv_bndr :: { LHsTyVarBndr RdrName } : tyvar { L1 (UserTyVar (unLoc $1)) } - | '(' tyvar '::' kind ')' { LL (KindedTyVar (unLoc $2) $4) } + | '(' tyvar '::' kind ')' { LL (KindedTyVar (unLoc $2) + (unLoc $4)) } fds :: { Located [Located ([RdrName], [RdrName])] } : {- empty -} { noLoc [] } @@ -769,14 +843,14 @@ varids0 :: { Located [RdrName] } ----------------------------------------------------------------------------- -- Kinds -kind :: { Kind } +kind :: { Located Kind } : akind { $1 } - | akind '->' kind { mkArrowKind $1 $3 } + | akind '->' kind { LL (mkArrowKind (unLoc $1) (unLoc $3)) } -akind :: { Kind } - : '*' { liftedTypeKind } - | '!' { unliftedTypeKind } - | '(' kind ')' { $2 } +akind :: { Located Kind } + : '*' { L1 liftedTypeKind } + | '!' { L1 unliftedTypeKind } + | '(' kind ')' { LL (unLoc $2) } ----------------------------------------------------------------------------- @@ -1389,6 +1463,8 @@ varid_no_unsafe :: { Located RdrName } : VARID { L1 $! mkUnqual varName (getVARID $1) } | special_id { L1 $! mkUnqual varName (unLoc $1) } | 'forall' { L1 $! mkUnqual varName FSLIT("forall") } + | 'iso' { L1 $! mkUnqual varName FSLIT("iso") } + | 'family' { L1 $! mkUnqual varName FSLIT("family") } qvarsym :: { Located RdrName } : varsym { $1 } @@ -1412,7 +1488,8 @@ varsym_no_minus :: { Located RdrName } -- varsym not including '-' -- These special_ids are treated as keywords in various places, -- but as ordinary ids elsewhere. 'special_id' collects all these --- except 'unsafe' and 'forall' whose treatment differs depending on context +-- except 'unsafe', 'forall', 'family', and 'iso' whose treatment differs +-- depending on context special_id :: { Located FastString } special_id : 'as' { L1 FSLIT("as") } @@ -1423,7 +1500,6 @@ special_id | 'dynamic' { L1 FSLIT("dynamic") } | 'stdcall' { L1 FSLIT("stdcall") } | 'ccall' { L1 FSLIT("ccall") } - | 'iso' { L1 FSLIT("iso") } special_sym :: { Located FastString } special_sym : '!' { L1 FSLIT("!") }