X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=0a8b0b6eec3ffebb34283575fd592a83c7d8b013;hb=ac9c1e5de9629103a125e0515dcee2466ff898a7;hp=7b9786fa03f84e3f61cf49065a2b6484d297751e;hpb=72264dbcb05c7045dff28aa88b55634fa6c1ddf0;p=ghc-hetmet.git diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp index 7b9786f..0a8b0b6 100644 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp @@ -186,6 +186,7 @@ incorrect. 'unsafe' { L _ ITunsafe } 'mdo' { L _ ITmdo } 'iso' { L _ ITiso } + 'family' { L _ ITfamily } 'stdcall' { L _ ITstdcallconv } 'ccall' { L _ ITccallconv } 'dotnet' { L _ ITdotnet } @@ -444,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) @@ -467,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 False -- only type vars allowed + ; (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) } } @@ -476,62 +478,97 @@ cl_decl :: { LTyClDecl RdrName } -- Type declarations -- ty_decl :: { LTyClDecl RdrName } - -- type function signature and equations (w/ type synonyms as special - -- case); we need to handle all this in one rule to avoid a large - -- number of shift/reduce conflicts (due to the generality of `type') - : 'type' opt_iso type kind_or_ctype + -- 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 -- -- Note the use of type for the head; this allows - -- infix type constructors to be declared and type - -- patterns for type function equations - -- - -- We have that `typats :: Maybe [LHsType name]' is `Nothing' - -- (in the second case alternative) when all arguments are - -- variables (and we thus have a vanilla type synonym - -- declaration); otherwise, it contains all arguments as type - -- patterns. + -- 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 -- - {% case $4 of - Left kind -> - do { (tc, tvs, _) <- checkSynHdr $3 False - ; return (L (comb3 $1 $3 kind) - (TyFunction tc tvs $2 (unLoc kind))) - } - Right ty -> - do { (tc, tvs, typats) <- checkSynHdr $3 True - ; return (L (comb2 $1 ty) - (TySynonym tc tvs typats ty)) } - } - - -- 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 { (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)) + } } - -- GADT declaration + -- ordinary data type or newtype declaration + | data_or_newtype tycl_hdr constrs deriving + {% 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 } -kind_or_ctype :: { Either (Located (Maybe Kind)) (LHsType RdrName) } - : { Left (noLoc Nothing) } - | '::' kind { Left (LL (Just (unLoc $2))) } - | '=' ctype { Right (LL (unLoc $2)) } - -- 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 - data_or_newtype :: { Located NewOrData } : 'data' { L1 DataType } | 'newtype' { L1 NewType } @@ -540,7 +577,7 @@ opt_kind_sig :: { Maybe Kind } : { Nothing } | '::' 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 @@ -550,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 } @@ -1426,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 } @@ -1449,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") } @@ -1460,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("!") }