X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=158043bcb8f463e9b940dbdf43921b6a496992ba;hb=589ba227fff5946de91cf3a9b88c80953d95f9c7;hp=1ad8d5f07d39262bddfdd38533a348c6938bb2fb;hpb=fce276e16071947919e1e24eaae0288cfa8edfdd;p=ghc-hetmet.git diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp index 1ad8d5f..158043b 100644 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp @@ -45,6 +45,17 @@ import GLAEXTS {- ----------------------------------------------------------------------------- +26 July 2006 + +Conflicts: 37 shift/reduce + 1 reduce/reduce + +The reduce/reduce conflict is weird. It's between tyconsym and consym, and I +would think the two should never occur in the same context. + + -=chak + +----------------------------------------------------------------------------- Conflicts: 36 shift/reduce (1.25) 10 for abiguity in 'if x then y else z + 1' [State 178] @@ -102,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. @@ -164,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 } @@ -173,6 +185,7 @@ incorrect. 'threadsafe' { L _ ITthreadsafe } 'unsafe' { L _ ITunsafe } 'mdo' { L _ ITmdo } + 'iso' { L _ ITiso } 'stdcall' { L _ ITstdcallconv } 'ccall' { L _ ITccallconv } 'dotnet' { L _ ITdotnet } @@ -430,10 +443,12 @@ topdecls :: { OrdList (LHsDecl RdrName) } | topdecl { $1 } topdecl :: { OrdList (LHsDecl RdrName) } - : tycl_decl { unitOL (L1 (TyClD (unLoc $1))) } + : cl_decl { unitOL (L1 (TyClD (unLoc $1))) } + | ty_decl {% checkTopTyClD $1 >>= return.unitOL.L1 } | 'instance' inst_type where - { let (binds,sigs) = cvBindsAndSigs (unLoc $3) - in unitOL (L (comb3 $1 $2 $3) (InstD (InstDecl $2 binds sigs))) } + { let (binds, sigs, ats) = cvBindsAndSigs (unLoc $3) + in unitOL (L (comb3 $1 $2 $3) + (InstD (InstDecl $2 binds sigs ats))) } | 'default' '(' comma_types0 ')' { unitOL (LL $ DefD (DefaultDecl $3)) } | 'foreign' fdecl { unitOL (LL (unLoc $2)) } | '{-# DEPRECATED' deprecations '#-}' { $2 } @@ -446,35 +461,82 @@ topdecl :: { OrdList (LHsDecl RdrName) } L1 $ HsVar (mkUnqual varName (getTH_ID_SPLICE $1)) )) } -tycl_decl :: { LTyClDecl RdrName } - : 'type' type '=' ctype - -- Note type on the left of the '='; this allows - -- infix type constructors to be declared +-- Type classes +-- +cl_decl :: { LTyClDecl RdrName } + : 'class' tycl_hdr fds where + {% do { let { (binds, sigs, ats) = + cvBindsAndSigs (unLoc $4) + ; (ctxt, tc, tvs, tparms) = unLoc $2} + ; checkTyVars tparms False -- only type vars allowed + ; return $ L (comb4 $1 $2 $3 $4) + (mkClassDecl (ctxt, tc, tvs) + (unLoc $3) sigs binds ats) } } + +-- 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 + -- + -- Note the use of type for the head; this allows + -- infix type constructors to be declared and type + -- patterns for type function equations -- - -- Note ctype, not sigtype, on the right - -- 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)) } } - + -- 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. + -- + {% 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 { let {(ctxt, tc, tvs, tparms) = unLoc $2} + ; tpats <- checkTyVars tparms True -- can have type pats + ; 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, tpats) + Nothing (reverse (unLoc $3)) (unLoc $4)) } } + + -- 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)) } - - | 'class' tycl_hdr fds where - { let - (binds,sigs) = cvBindsAndSigs (unLoc $4) - in - L (comb4 $1 $2 $3 $4) (mkClassDecl (unLoc $2) (unLoc $3) sigs - binds) } + {% do { let {(ctxt, tc, tvs, tparms) = unLoc $2} + ; tpats <- checkTyVars tparms True -- can have type pats + ; return $ + L (comb4 $1 $2 $4 $5) + (mkTyData (unLoc $1) (ctxt, tc, tvs, tpats) $3 + (reverse (unLoc $5)) (unLoc $6)) } } + +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 } @@ -482,21 +544,51 @@ 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 or class decl, +-- tycl_hdr parses the header of a class or data type decl, -- which takes the form -- T a b -- Eq a => T a -- (Eq a, Ord b) => T a b +-- T Int [a] -- for associated types -- Rather a lot of inlining here, else we get reduce/reduce errors -tycl_hdr :: { Located (LHsContext RdrName, Located RdrName, [LHsTyVarBndr RdrName]) } +tycl_hdr :: { Located (LHsContext RdrName, + Located RdrName, + [LHsTyVarBndr RdrName], + [LHsType RdrName]) } : context '=>' type {% checkTyClHdr $1 $3 >>= return.LL } | type {% checkTyClHdr (noLoc []) $1 >>= return.L1 } ----------------------------------------------------------------------------- -- Nested declarations +-- Type declaration or value declaration +-- +tydecl :: { Located (OrdList (LHsDecl RdrName)) } +tydecl : ty_decl { LL (unitOL (L1 (TyClD (unLoc $1)))) } + | decl { $1 } + +tydecls :: { Located (OrdList (LHsDecl RdrName)) } -- Reversed + : tydecls ';' tydecl { LL (unLoc $1 `appOL` unLoc $3) } + | tydecls ';' { LL (unLoc $1) } + | tydecl { $1 } + | {- empty -} { noLoc nilOL } + + +tydecllist + :: { Located (OrdList (LHsDecl RdrName)) } -- Reversed + : '{' tydecls '}' { LL (unLoc $2) } + | vocurly tydecls close { $2 } + +-- Form of the body of class and instance declarations +-- +where :: { Located (OrdList (LHsDecl RdrName)) } -- Reversed + -- No implicit parameters + -- May have type declarations + : 'where' tydecllist { LL (unLoc $2) } + | {- empty -} { noLoc nilOL } + decls :: { Located (OrdList (LHsDecl RdrName)) } : decls ';' decl { LL (unLoc $1 `appOL` unLoc $3) } | decls ';' { LL (unLoc $1) } @@ -508,17 +600,16 @@ decllist :: { Located (OrdList (LHsDecl RdrName)) } : '{' decls '}' { LL (unLoc $2) } | vocurly decls close { $2 } -where :: { Located (OrdList (LHsDecl RdrName)) } - -- No implicit parameters - : 'where' decllist { LL (unLoc $2) } - | {- empty -} { noLoc nilOL } - +-- Binding groups other than those of class and instance declarations +-- binds :: { Located (HsLocalBinds RdrName) } -- May have implicit parameters + -- No type declarations : decllist { L1 (HsValBinds (cvBindGroup (unLoc $1))) } | '{' dbinds '}' { LL (HsIPBinds (IPBinds (unLoc $2) emptyLHsBinds)) } | vocurly dbinds close { L (getLoc $2) (HsIPBinds (IPBinds (unLoc $2) emptyLHsBinds)) } wherebinds :: { Located (HsLocalBinds RdrName) } -- May have implicit parameters + -- No type declarations : 'where' binds { LL (unLoc $2) } | {- empty -} { noLoc emptyLocalBinds } @@ -670,7 +761,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)) } @@ -699,7 +790,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 [] } @@ -720,14 +812,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) } ----------------------------------------------------------------------------- @@ -753,7 +845,7 @@ gadt_constr :: { LConDecl RdrName } { LL (mkGadtDecl $1 $3) } -- Syntax: Maybe merge the record stuff with the single-case above? -- (to kill the mostly harmless reduce/reduce error) - -- XXX revisit autrijus + -- XXX revisit audreyt | constr_stuff_record '::' sigtype { let (con,details) = unLoc $1 in LL (ConDecl con Implicit [] (noLoc []) details (ResTyGADT $3)) } @@ -1104,6 +1196,8 @@ alts1 :: { Located [LMatch RdrName] } alt :: { LMatch RdrName } : infixexp opt_sig alt_rhs {% checkPattern $1 >>= \p -> return (LL (Match [p] $2 (unLoc $3))) } + | '!' infixexp opt_sig alt_rhs {% checkPattern $2 >>= \p -> + return (LL (Match [LL $ BangPat p] $3 (unLoc $4))) } alt_rhs :: { Located (GRHSs RdrName) } : ralt wherebinds { LL (GRHSs (unLoc $1) (unLoc $2)) } @@ -1372,6 +1466,7 @@ 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("!") }