X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=898d45c5e9614ae22cb60e4bc774e2371312a4c0;hp=3066a0f8765c6cae45a277cc158c5d12ae329a2c;hb=a8839bb4c0a25a961ea315fa2cfdcc78b44b8878;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1 diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp index 3066a0f..898d45c 100644 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp @@ -32,7 +32,7 @@ import SrcLoc ( Located(..), unLoc, getLoc, noLoc, combineSrcSpans, mkSrcLoc, mkSrcSpan ) import Module import StaticFlags ( opt_SccProfilingOn ) -import Type ( Kind, mkArrowKind, liftedTypeKind ) +import Type ( Kind, mkArrowKind, liftedTypeKind, unliftedTypeKind ) import BasicTypes ( Boxity(..), Fixity(..), FixityDirection(..), IPName(..), Activation(..), defaultInlineSpec ) import OrdList @@ -83,10 +83,6 @@ Conflicts: 36 shift/reduce (1.25) might be the start of the declaration with the activation being empty. --SDM 1/4/2002 -6 for conflicts between `fdecl' and `fdeclDEPRECATED', [States 393,394] - which are resolved correctly, and moreover, - should go away when `fdeclDEPRECATED' is removed. - 1 for ambiguity in '{-# RULES "name" forall = ... #-}' [State 474] since 'forall' is a valid variable name, we don't know whether to treat a forall on the input as the beginning of a quantifier @@ -346,10 +342,13 @@ maybeexports :: { Maybe [LIE RdrName] } : '(' exportlist ')' { Just $2 } | {- empty -} { Nothing } -exportlist :: { [LIE RdrName] } - : exportlist ',' export { $3 : $1 } - | exportlist ',' { $1 } - | export { [$1] } +exportlist :: { [LIE RdrName] } + : ',' { [] } + | exportlist1 { $1 } + +exportlist1 :: { [LIE RdrName] } + : export { [$1] } + | export ',' exportlist { $1 : $3 } | {- empty -} { [] } -- No longer allow things like [] and (,,,) to be exported @@ -394,7 +393,7 @@ optqualified :: { Bool } : 'qualified' { True } | {- empty -} { False } -maybeas :: { Located (Maybe Module) } +maybeas :: { Located (Maybe ModuleName) } : 'as' modid { LL (Just (unLoc $2)) } | {- empty -} { noLoc Nothing } @@ -403,8 +402,8 @@ maybeimpspec :: { Located (Maybe (Bool, [LIE RdrName])) } | {- empty -} { noLoc Nothing } impspec :: { Located (Bool, [LIE RdrName]) } - : '(' exportlist ')' { LL (False, reverse $2) } - | 'hiding' '(' exportlist ')' { LL (True, reverse $3) } + : '(' exportlist ')' { LL (False, $2) } + | 'hiding' '(' exportlist ')' { LL (True, $3) } ----------------------------------------------------------------------------- -- Fixity Declarations @@ -425,7 +424,7 @@ ops :: { Located [Located RdrName] } ----------------------------------------------------------------------------- -- Top-Level Declarations -topdecls :: { OrdList (LHsDecl RdrName) } -- Reversed +topdecls :: { OrdList (LHsDecl RdrName) } : topdecls ';' topdecl { $1 `appOL` $3 } | topdecls ';' { $1 } | topdecl { $1 } @@ -439,9 +438,14 @@ topdecl :: { OrdList (LHsDecl RdrName) } | 'foreign' fdecl { unitOL (LL (unLoc $2)) } | '{-# DEPRECATED' deprecations '#-}' { $2 } | '{-# RULES' rules '#-}' { $2 } - | '$(' exp ')' { unitOL (LL $ SpliceD (SpliceDecl $2)) } | decl { unLoc $1 } + -- Template Haskell Extension + | '$(' exp ')' { unitOL (LL $ SpliceD (SpliceDecl $2)) } + | TH_ID_SPLICE { unitOL (LL $ SpliceD (SpliceDecl $ + L1 $ HsVar (mkUnqual varName (getTH_ID_SPLICE $1)) + )) } + tycl_decl :: { LTyClDecl RdrName } : 'type' type '=' ctype -- Note type on the left of the '='; this allows @@ -493,18 +497,18 @@ tycl_hdr :: { Located (LHsContext RdrName, Located RdrName, [LHsTyVarBndr RdrNam ----------------------------------------------------------------------------- -- Nested declarations -decls :: { Located (OrdList (LHsDecl RdrName)) } -- Reversed +decls :: { Located (OrdList (LHsDecl RdrName)) } : decls ';' decl { LL (unLoc $1 `appOL` unLoc $3) } | decls ';' { LL (unLoc $1) } | decl { $1 } | {- empty -} { noLoc nilOL } -decllist :: { Located (OrdList (LHsDecl RdrName)) } -- Reversed +decllist :: { Located (OrdList (LHsDecl RdrName)) } : '{' decls '}' { LL (unLoc $2) } | vocurly decls close { $2 } -where :: { Located (OrdList (LHsDecl RdrName)) } -- Reversed +where :: { Located (OrdList (LHsDecl RdrName)) } -- No implicit parameters : 'where' decllist { LL (unLoc $2) } | {- empty -} { noLoc nilOL } @@ -522,7 +526,7 @@ wherebinds :: { Located (HsLocalBinds RdrName) } -- May have implicit parameters ----------------------------------------------------------------------------- -- Transformation Rules -rules :: { OrdList (LHsDecl RdrName) } -- Reversed +rules :: { OrdList (LHsDecl RdrName) } : rules ';' rule { $1 `snocOL` $3 } | rules ';' { $1 } | rule { unitOL $1 } @@ -557,7 +561,7 @@ rule_var :: { RuleBndr RdrName } ----------------------------------------------------------------------------- -- Deprecations (c.f. rules) -deprecations :: { OrdList (LHsDecl RdrName) } -- Reversed +deprecations :: { OrdList (LHsDecl RdrName) } : deprecations ';' deprecation { $1 `appOL` $3 } | deprecations ';' { $1 } | deprecation { $1 } @@ -573,123 +577,14 @@ deprecation :: { OrdList (LHsDecl RdrName) } ----------------------------------------------------------------------------- -- Foreign import and export declarations --- for the time being, the following accepts foreign declarations conforming --- to the FFI Addendum, Version 1.0 as well as pre-standard declarations --- --- * a flag indicates whether pre-standard declarations have been used and --- triggers a deprecation warning further down the road --- --- NB: The first two rules could be combined into one by replacing `safety1' --- with `safety'. However, the combined rule conflicts with the --- DEPRECATED rules. --- fdecl :: { LHsDecl RdrName } -fdecl : 'import' callconv safety1 fspec +fdecl : 'import' callconv safety fspec {% mkImport $2 $3 (unLoc $4) >>= return.LL } - | 'import' callconv fspec + | 'import' callconv fspec {% do { d <- mkImport $2 (PlaySafe False) (unLoc $3); return (LL d) } } | 'export' callconv fspec {% mkExport $2 (unLoc $3) >>= return.LL } - -- the following syntax is DEPRECATED - | fdecl1DEPRECATED { L1 (ForD (unLoc $1)) } - | fdecl2DEPRECATED { L1 (unLoc $1) } - -fdecl1DEPRECATED :: { LForeignDecl RdrName } -fdecl1DEPRECATED - ----------- DEPRECATED label decls ------------ - : 'label' ext_name varid '::' sigtype - { LL $ ForeignImport $3 $5 (CImport defaultCCallConv (PlaySafe False) nilFS nilFS - (CLabel ($2 `orElse` mkExtName (unLoc $3)))) True } - - ----------- DEPRECATED ccall/stdcall decls ------------ - -- - -- NB: This business with the case expression below may seem overly - -- complicated, but it is necessary to avoid some conflicts. - - -- DEPRECATED variant #1: lack of a calling convention specification - -- (import) - | 'import' {-no callconv-} ext_name safety varid_no_unsafe '::' sigtype - { let - target = StaticTarget ($2 `orElse` mkExtName (unLoc $4)) - in - LL $ ForeignImport $4 $6 (CImport defaultCCallConv $3 nilFS nilFS - (CFunction target)) True } - - -- DEPRECATED variant #2: external name consists of two separate strings - -- (module name and function name) (import) - | 'import' callconv STRING STRING safety varid_no_unsafe '::' sigtype - {% case $2 of - DNCall -> parseError (comb2 $1 $>) "Illegal format of .NET foreign import" - CCall cconv -> return $ - let - imp = CFunction (StaticTarget (getSTRING $4)) - in - LL $ ForeignImport $6 $8 (CImport cconv $5 nilFS nilFS imp) True } - - -- DEPRECATED variant #3: `unsafe' after entity - | 'import' callconv STRING 'unsafe' varid_no_unsafe '::' sigtype - {% case $2 of - DNCall -> parseError (comb2 $1 $>) "Illegal format of .NET foreign import" - CCall cconv -> return $ - let - imp = CFunction (StaticTarget (getSTRING $3)) - in - LL $ ForeignImport $5 $7 (CImport cconv PlayRisky nilFS nilFS imp) True } - - -- DEPRECATED variant #4: use of the special identifier `dynamic' without - -- an explicit calling convention (import) - | 'import' {-no callconv-} 'dynamic' safety varid_no_unsafe '::' sigtype - { LL $ ForeignImport $4 $6 (CImport defaultCCallConv $3 nilFS nilFS - (CFunction DynamicTarget)) True } - - -- DEPRECATED variant #5: use of the special identifier `dynamic' (import) - | 'import' callconv 'dynamic' safety varid_no_unsafe '::' sigtype - {% case $2 of - DNCall -> parseError (comb2 $1 $>) "Illegal format of .NET foreign import" - CCall cconv -> return $ - LL $ ForeignImport $5 $7 (CImport cconv $4 nilFS nilFS - (CFunction DynamicTarget)) True } - - -- DEPRECATED variant #6: lack of a calling convention specification - -- (export) - | 'export' {-no callconv-} ext_name varid '::' sigtype - { LL $ ForeignExport $3 $5 (CExport (CExportStatic ($2 `orElse` mkExtName (unLoc $3)) - defaultCCallConv)) True } - - -- DEPRECATED variant #7: external name consists of two separate strings - -- (module name and function name) (export) - | 'export' callconv STRING STRING varid '::' sigtype - {% case $2 of - DNCall -> parseError (comb2 $1 $>) "Illegal format of .NET foreign import" - CCall cconv -> return $ - LL $ ForeignExport $5 $7 - (CExport (CExportStatic (getSTRING $4) cconv)) True } - - -- DEPRECATED variant #8: use of the special identifier `dynamic' without - -- an explicit calling convention (export) - | 'export' {-no callconv-} 'dynamic' varid '::' sigtype - { LL $ ForeignImport $3 $5 (CImport defaultCCallConv (PlaySafe False) nilFS nilFS - CWrapper) True } - - -- DEPRECATED variant #9: use of the special identifier `dynamic' (export) - | 'export' callconv 'dynamic' varid '::' sigtype - {% case $2 of - DNCall -> parseError (comb2 $1 $>) "Illegal format of .NET foreign import" - CCall cconv -> return $ - LL $ ForeignImport $4 $6 - (CImport cconv (PlaySafe False) nilFS nilFS CWrapper) True } - - ----------- DEPRECATED .NET decls ------------ - -- NB: removed the .NET call declaration, as it is entirely subsumed - -- by the new standard FFI declarations - -fdecl2DEPRECATED :: { LHsDecl RdrName } -fdecl2DEPRECATED - : 'import' 'dotnet' 'type' ext_name tycon { LL $ TyClD (ForeignType $5 $4 DNType) } - -- left this one unchanged for the moment as type imports are not - -- covered currently by the FFI standard -=chak - callconv :: { CallConv } : 'stdcall' { CCall StdCallConv } @@ -698,15 +593,8 @@ callconv :: { CallConv } safety :: { Safety } : 'unsafe' { PlayRisky } - | 'safe' { PlaySafe False } - | 'threadsafe' { PlaySafe True } - | {- empty -} { PlaySafe False } - -safety1 :: { Safety } - : 'unsafe' { PlayRisky } | 'safe' { PlaySafe False } | 'threadsafe' { PlaySafe True } - -- only needed to avoid conflicts with the DEPRECATED rules fspec :: { Located (Located FastString, Located RdrName, LHsType RdrName) } : STRING var '::' sigtype { LL (L (getLoc $1) (getSTRING $1), $2, $4) } @@ -715,13 +603,6 @@ fspec :: { Located (Located FastString, Located RdrName, LHsType RdrName) } -- the meaning of an empty entity string depends on the calling -- convention --- DEPRECATED syntax -ext_name :: { Maybe CLabelString } - : STRING { Just (getSTRING $1) } - | STRING STRING { Just (getSTRING $2) } -- Ignore "module name" for now - | {- empty -} { Nothing } - - ----------------------------------------------------------------------------- -- Type signatures @@ -845,6 +726,7 @@ kind :: { Kind } akind :: { Kind } : '*' { liftedTypeKind } + | '!' { unliftedTypeKind } | '(' kind ')' { $2 } @@ -871,7 +753,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)) } @@ -1099,7 +981,7 @@ aexp2 :: { LHsExpr RdrName } | '(' qopm infixexp ')' { LL $ SectionR $2 $3 } | '_' { L1 EWildPat } - -- MetaHaskell Extension + -- Template Haskell Extension | TH_ID_SPLICE { L1 $ HsSpliceE (mkHsSplice (L1 $ HsVar (mkUnqual varName (getTH_ID_SPLICE $1)))) } -- $x @@ -1222,6 +1104,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)) } @@ -1539,10 +1423,10 @@ close :: { () } ----------------------------------------------------------------------------- -- Miscellaneous (mostly renamings) -modid :: { Located Module } - : CONID { L1 $ mkModuleFS (getCONID $1) } +modid :: { Located ModuleName } + : CONID { L1 $ mkModuleNameFS (getCONID $1) } | QCONID { L1 $ let (mod,c) = getQCONID $1 in - mkModuleFS + mkModuleNameFS (mkFastString (unpackFS mod ++ '.':unpackFS c)) }