X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2FParser.y;h=30a19507bc64fc2d337d0f50b5fc59a49df042a1;hb=64499dfb10860daf712c7f522b790f94658ea9fb;hp=8894a000245ec5d690ce444be60fec9dfba8b551;hpb=2f4b06256b28a4b0a41441e7f6962a8dddbd7729;p=ghc-hetmet.git diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index 8894a00..30a1950 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ {- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.60 2001/05/07 14:38:15 simonmar Exp $ +$Id: Parser.y,v 1.72 2001/07/23 10:54:48 simonpj Exp $ Haskell grammar. @@ -21,16 +21,20 @@ import RdrName import PrelNames ( mAIN_Name, unitTyCon_RDR, funTyCon_RDR, listTyCon_RDR, tupleTyCon_RDR, unitCon_RDR, nilCon_RDR, tupleCon_RDR ) +import ForeignCall ( Safety(..), CExportSpec(..), CCallSpec(..), + CCallConv(..), CCallTarget(..), defaultCCallConv, + DNCallSpec(..) ) import OccName ( UserFS, varName, tcName, dataName, tcClsName, tvName ) import SrcLoc ( SrcLoc ) import Module -import CallConv import CmdLineOpts ( opt_SccProfilingOn ) -import BasicTypes ( Boxity(..), Fixity(..), FixityDirection(..), NewOrData(..) ) +import BasicTypes ( Boxity(..), Fixity(..), FixityDirection(..), NewOrData(..), StrictnessMark(..) ) import Panic import GlaExts -import FastString ( tailFS ) +import CStrings ( CLabelString ) +import FastString +import Maybes ( orElse ) import Outputable #include "HsVersions.h" @@ -101,10 +105,11 @@ Conflicts: 14 shift/reduce 'with' { ITwith } 'stdcall' { ITstdcallconv } 'ccall' { ITccallconv } - '_ccall_' { ITccall (False, False, False) } - '_ccall_GC_' { ITccall (False, False, True) } - '_casm_' { ITccall (False, True, False) } - '_casm_GC_' { ITccall (False, True, True) } + 'dotnet' { ITdotnet } + '_ccall_' { ITccall (False, False, PlayRisky) } + '_ccall_GC_' { ITccall (False, False, PlaySafe) } + '_casm_' { ITccall (False, True, PlayRisky) } + '_casm_GC_' { ITccall (False, True, PlaySafe) } '{-# SPECIALISE' { ITspecialise_prag } '{-# SOURCE' { ITsource_prag } @@ -279,8 +284,8 @@ importdecls :: { [RdrNameImportDecl] } | {- empty -} { [] } importdecl :: { RdrNameImportDecl } - : 'import' srcloc maybe_src optqualified CONID maybeas maybeimpspec - { ImportDecl (mkModuleNameFS $5) $3 $4 $6 $7 $2 } + : 'import' srcloc maybe_src optqualified modid maybeas maybeimpspec + { ImportDecl $5 $3 $4 $6 $7 $2 } maybe_src :: { WhereFrom } : '{-# SOURCE' '#-}' { ImportByUserSource } @@ -335,10 +340,10 @@ topdecl :: { RdrBinding } -- Instead we just say b is out of scope { RdrHsDecl (TyClD (TySynonym (fst $3) (snd $3) $5 $1)) } - | srcloc 'data' ctype '=' constrs deriving + | srcloc 'data' ctype constrs deriving {% checkDataHeader $3 `thenP` \(cs,c,ts) -> returnP (RdrHsDecl (TyClD - (mkTyData DataType cs c ts (reverse $5) (length $5) $6 $1))) } + (mkTyData DataType cs c ts (reverse $4) (length $4) $5 $1))) } | srcloc 'newtype' ctype '=' newconstr deriving {% checkDataHeader $3 `thenP` \(cs,c,ts) -> @@ -359,23 +364,45 @@ topdecl :: { RdrBinding } (groupBindings $4) in RdrHsDecl (InstD (InstDecl $3 binds sigs Nothing $1)) } - | srcloc 'default' '(' types0 ')' - { RdrHsDecl (DefD (DefaultDecl $4 $1)) } + | srcloc 'default' '(' types0 ')' { RdrHsDecl (DefD (DefaultDecl $4 $1)) } + | 'foreign' fordecl { RdrHsDecl $2 } + | '{-# DEPRECATED' deprecations '#-}' { $2 } + | '{-# RULES' rules '#-}' { $2 } + | decl { $1 } - | srcloc 'foreign' 'import' callconv ext_name - unsafe_flag varid_no_unsafe '::' sigtype - { RdrHsDecl (ForD (ForeignDecl $7 (FoImport $6) $9 (mkExtName $5 $7) $4 $1)) } +fordecl :: { RdrNameHsDecl } +fordecl : srcloc 'label' ext_name varid '::' sigtype + { ForD (ForeignImport $4 $6 (LblImport ($3 `orElse` mkExtName $4)) $1) } - | srcloc 'foreign' 'export' callconv ext_name varid '::' sigtype - { RdrHsDecl (ForD (ForeignDecl $6 FoExport $8 (mkExtName $5 $6) $4 $1)) } - | srcloc 'foreign' 'label' ext_name varid '::' sigtype - { RdrHsDecl (ForD (ForeignDecl $5 FoLabel $7 (mkExtName $4 $5) - defaultCallConv $1)) } + ----------- ccall/stdcall decls ------------ + | srcloc 'import' ccallconv ext_name unsafe_flag varid_no_unsafe '::' sigtype + { let + call_spec = CCallSpec (StaticTarget ($4 `orElse` mkExtName $6)) $3 $5 + in + ForD (ForeignImport $6 $8 (CImport call_spec) $1) + } - | '{-# DEPRECATED' deprecations '#-}' { $2 } - | '{-# RULES' rules '#-}' { $2 } - | decl { $1 } + | srcloc 'import' ccallconv 'dynamic' unsafe_flag varid_no_unsafe '::' sigtype + { let + call_spec = CCallSpec DynamicTarget $3 $5 + in + ForD (ForeignImport $6 $8 (CImport call_spec) $1) + } + + | srcloc 'export' ccallconv ext_name varid '::' sigtype + { ForD (ForeignExport $5 $7 (CExport (CExportStatic ($4 `orElse` mkExtName $5) $3)) $1) } + + | srcloc 'export' ccallconv 'dynamic' varid '::' sigtype + { ForD (ForeignImport $5 $7 (CDynImport $3) $1) } + + + ----------- .NET decls ------------ + | srcloc 'import' 'dotnet' ext_name varid '::' sigtype + { ForD (ForeignImport $5 $7 (DNImport (DNCallSpec ($4 `orElse` mkExtName $5))) $1) } + + | srcloc 'import' 'dotnet' 'type' ext_name tycon + { TyClD (ForeignType $6 $5 DNType $1) } decls :: { [RdrBinding] } : decls ';' decl { $3 : $1 } @@ -461,19 +488,17 @@ deprecation :: { RdrBinding } ----------------------------------------------------------------------------- -- Foreign import/export -callconv :: { Int } - : 'stdcall' { stdCallConv } - | 'ccall' { cCallConv } - | {- empty -} { defaultCallConv } +ccallconv :: { CCallConv } + : 'stdcall' { StdCallConv } + | 'ccall' { CCallConv } + | {- empty -} { defaultCCallConv } -unsafe_flag :: { Bool } - : 'unsafe' { True } - | {- empty -} { False } +unsafe_flag :: { Safety } + : 'unsafe' { PlayRisky } + | {- empty -} { PlaySafe } -ext_name :: { Maybe ExtName } - : 'dynamic' { Just Dynamic } - | STRING { Just (ExtName $1 Nothing) } - | STRING STRING { Just (ExtName $2 (Just $1)) } +ext_name :: { Maybe CLabelString } + : STRING { Just $1 } | {- empty -} { Nothing } @@ -574,12 +599,16 @@ varids0 :: { [RdrName] } -- Datatype declarations newconstr :: { RdrNameConDecl } - : srcloc conid atype { mkConDecl $2 [] [] (VanillaCon [Unbanged $3]) $1 } + : srcloc conid atype { mkConDecl $2 [] [] (VanillaCon [unbangedType $3]) $1 } | srcloc conid '{' var '::' type '}' - { mkConDecl $2 [] [] (RecCon [([$4], Unbanged $6)]) $1 } + { mkConDecl $2 [] [] (RecCon [([$4], unbangedType $6)]) $1 } constrs :: { [RdrNameConDecl] } - : constrs '|' constr { $3 : $1 } + : {- empty; a GHC extension -} { [] } + | '=' constrs1 { $2 } + +constrs1 :: { [RdrNameConDecl] } + : constrs1 '|' constr { $3 : $1 } | constr { [$1] } constr :: { RdrNameConDecl } @@ -597,18 +626,18 @@ context :: { RdrNameContext } constr_stuff :: { (RdrName, RdrNameConDetails) } : btype {% mkVanillaCon $1 [] } - | btype '!' atype satypes {% mkVanillaCon $1 (Banged $3 : $4) } + | btype '!' atype satypes {% mkVanillaCon $1 (BangType MarkedUserStrict $3 : $4) } | gtycon '{' fielddecls '}' {% mkRecCon $1 $3 } | sbtype conop sbtype { ($2, InfixCon $1 $3) } satypes :: { [RdrNameBangType] } - : atype satypes { Unbanged $1 : $2 } - | '!' atype satypes { Banged $2 : $3 } + : atype satypes { unbangedType $1 : $2 } + | '!' atype satypes { BangType MarkedUserStrict $2 : $3 } | {- empty -} { [] } sbtype :: { RdrNameBangType } - : btype { Unbanged $1 } - | '!' atype { Banged $2 } + : btype { unbangedType $1 } + | '!' atype { BangType MarkedUserStrict $2 } fielddecls :: { [([RdrName],RdrNameBangType)] } : fielddecl ',' fielddecls { $1 : $3 } @@ -618,8 +647,8 @@ fielddecl :: { ([RdrName],RdrNameBangType) } : sig_vars '::' stype { (reverse $1, $3) } stype :: { RdrNameBangType } - : ctype { Unbanged $1 } - | '!' atype { Banged $2 } + : ctype { unbangedType $1 } + | '!' atype { BangType MarkedUserStrict $2 } deriving :: { Maybe [RdrName] } : {- empty -} { Nothing } @@ -663,16 +692,15 @@ valdef :: { RdrBinding } rhs :: { RdrNameGRHSs } - : '=' srcloc exp wherebinds { (GRHSs (unguardedRHS $3 $2) - $4 Nothing)} - | gdrhs wherebinds { GRHSs (reverse $1) $2 Nothing } + : '=' srcloc exp wherebinds { (GRHSs (unguardedRHS $3 $2) $4 placeHolderType)} + | gdrhs wherebinds { GRHSs (reverse $1) $2 placeHolderType } gdrhs :: { [RdrNameGRHS] } : gdrhs gdrh { $2 : $1 } | gdrh { [$1] } gdrh :: { RdrNameGRHS } - : '|' srcloc quals '=' exp { GRHS (reverse (ExprStmt $5 $2 : $3)) $2 } + : '|' srcloc quals '=' exp { GRHS (reverse (ResultStmt $5 $2 : $3)) $2 } ----------------------------------------------------------------------------- -- Expressions @@ -692,17 +720,18 @@ exp10 :: { RdrNameHsExpr } {% checkPatterns $2 ($3 : reverse $4) `thenP` \ ps -> returnP (HsLam (Match [] ps $5 (GRHSs (unguardedRHS $8 $7) - EmptyBinds Nothing))) } + EmptyBinds placeHolderType))) } | 'let' declbinds 'in' exp { HsLet $2 $4 } | 'if' srcloc exp 'then' exp 'else' exp { HsIf $3 $5 $7 $2 } | 'case' srcloc exp 'of' altslist { HsCase $3 $5 $2 } | '-' fexp { mkHsNegApp $2 } - | srcloc 'do' stmtlist { HsDo DoExpr $3 $1 } + | srcloc 'do' stmtlist {% checkDo $3 `thenP` \ stmts -> + returnP (HsDo DoExpr stmts $1) } - | '_ccall_' ccallid aexps0 { HsCCall $2 $3 False False cbot } - | '_ccall_GC_' ccallid aexps0 { HsCCall $2 $3 True False cbot } - | '_casm_' CLITLIT aexps0 { HsCCall $2 $3 False True cbot } - | '_casm_GC_' CLITLIT aexps0 { HsCCall $2 $3 True True cbot } + | '_ccall_' ccallid aexps0 { HsCCall $2 $3 PlayRisky False placeHolderType } + | '_ccall_GC_' ccallid aexps0 { HsCCall $2 $3 PlaySafe False placeHolderType } + | '_casm_' CLITLIT aexps0 { HsCCall $2 $3 PlayRisky True placeHolderType } + | '_casm_GC_' CLITLIT aexps0 { HsCCall $2 $3 PlaySafe True placeHolderType } | scc_annot exp { if opt_SccProfilingOn then HsSCC $1 $2 @@ -743,8 +772,8 @@ aexp1 :: { RdrNameHsExpr } : ipvar { HsIPVar $1 } | var_or_con { $1 } | literal { HsLit $1 } - | INTEGER { HsOverLit (HsIntegral $1) } - | RATIONAL { HsOverLit (HsFractional $1) } + | INTEGER { HsOverLit (mkHsIntegral $1) } + | RATIONAL { HsOverLit (mkHsFractional $1) } | '(' exp ')' { HsPar $2 } | '(' exp ',' texps ')' { ExplicitTuple ($2 : reverse $4) Boxed} | '(#' texps '#)' { ExplicitTuple (reverse $2) Unboxed } @@ -767,8 +796,8 @@ texps :: { [RdrNameHsExpr] } -- avoiding another shift/reduce-conflict. list :: { RdrNameHsExpr } - : exp { ExplicitList [$1] } - | lexps { ExplicitList (reverse $1) } + : exp { ExplicitList placeHolderType [$1] } + | lexps { ExplicitList placeHolderType (reverse $1) } | exp '..' { ArithSeqIn (From $1) } | exp ',' exp '..' { ArithSeqIn (FromThen $1 $3) } | exp '..' exp { ArithSeqIn (FromTo $1 $3) } @@ -777,7 +806,7 @@ list :: { RdrNameHsExpr } body qss = [ParStmt (map reverse qss)] } in returnP ( HsDo ListComp - (reverse (ExprStmt $1 $2 : body $3)) + (reverse (ResultStmt $1 $2 : body $3)) $2 ) } @@ -817,10 +846,10 @@ alt :: { RdrNameMatch } : srcloc infixexp opt_sig ralt wherebinds {% (checkPattern $1 $2 `thenP` \p -> returnP (Match [] [p] $3 - (GRHSs $4 $5 Nothing)) )} + (GRHSs $4 $5 placeHolderType)) )} ralt :: { [RdrNameGRHS] } - : '->' srcloc exp { [GRHS [ExprStmt $3 $2] $2] } + : '->' srcloc exp { [GRHS [ResultStmt $3 $2] $2] } | gdpats { (reverse $1) } gdpats :: { [RdrNameGRHS] } @@ -828,30 +857,31 @@ gdpats :: { [RdrNameGRHS] } | gdpat { [$1] } gdpat :: { RdrNameGRHS } - : srcloc '|' quals '->' exp { GRHS (reverse (ExprStmt $5 $1:$3)) $1} + : srcloc '|' quals '->' exp { GRHS (reverse (ResultStmt $5 $1:$3)) $1} ----------------------------------------------------------------------------- -- Statement sequences stmtlist :: { [RdrNameStmt] } - : '{' stmts '}' { reverse $2 } - | layout_on_for_do stmts close { reverse $2 } - --- Stmt list should really end in an expression, but it's not --- convenient to enforce this here, so we throw out erroneous --- statement sequences in the renamer instead. - + : '{' stmts '}' { $2 } + | layout_on_for_do stmts close { $2 } + +-- do { ;; s ; s ; ; s ;; } +-- The last Stmt should be a ResultStmt, but that's hard to enforce +-- here, because we need too much lookahead if we see do { e ; } +-- So we use ExprStmts throughout, and switch the last one over +-- in ParseUtils.checkDo instead stmts :: { [RdrNameStmt] } - : ';' stmts1 { $2 } - | stmts1 { $1 } + : stmt stmts_help { $1 : $2 } + | ';' stmts { $2 } + | {- empty -} { [] } -stmts1 :: { [RdrNameStmt] } - : stmts1 ';' stmt { $3 : $1 } - | stmts1 ';' { $1 } - | stmt { [$1] } +stmts_help :: { [RdrNameStmt] } + : ';' stmts { $2 } + | {- empty -} { [] } --- for typing stmts at the GHCi prompt, where the input may consist of --- just comments. +-- For typing stmts at the GHCi prompt, where +-- the input may consist of just comments. maybe_stmt :: { Maybe RdrNameStmt } : stmt { Just $1 } | {- nothing -} { Nothing } @@ -859,7 +889,7 @@ maybe_stmt :: { Maybe RdrNameStmt } stmt :: { RdrNameStmt } : srcloc infixexp '<-' exp {% checkPattern $1 $2 `thenP` \p -> returnP (BindStmt p $4 $1) } - | srcloc exp { ExprStmt $2 $1 } + | srcloc exp { ExprStmt $2 placeHolderType $1 } | srcloc 'let' declbinds { LetStmt $3 } ----------------------------------------------------------------------------- @@ -1063,7 +1093,7 @@ literal :: { HsLit } | PRIMSTRING { HsStringPrim $1 } | PRIMFLOAT { HsFloatPrim $1 } | PRIMDOUBLE { HsDoublePrim $1 } - | CLITLIT { HsLitLit $1 (error "Parser.y: CLITLIT") } + | CLITLIT { HsLitLit $1 placeHolderType } srcloc :: { SrcLoc } : {% getSrcLocP } @@ -1082,6 +1112,11 @@ layout_on_for_do :: { () } : {% layoutOn False } modid :: { ModuleName } : CONID { mkModuleNameFS $1 } + | QCONID { mkModuleNameFS + (mkFastString + (unpackFS (fst $1) ++ + '.':unpackFS (snd $1))) + } tycon :: { RdrName } : CONID { mkUnqual tcClsName $1 }