X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2FParser.y;h=18021175669ec129fb1e3bc0f8626000cfe67e81;hb=98232a6130f0661486899530fa3461e32499366f;hp=a3b437d3cd780fd8f27ea647155adbd2cc2b1062;hpb=536a6e2a2f4acfda2ab94231c8071e146c53ecc3;p=ghc-hetmet.git diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index a3b437d..1802117 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ -{- +{- -*-haskell-*- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.50 2001/01/17 16:54:04 simonmar Exp $ +$Id: Parser.y,v 1.121 2003/07/16 08:49:05 ross Exp $ Haskell grammar. @@ -9,46 +9,72 @@ Author(s): Simon Marlow, Sven Panne 1997, 1998, 1999 -} { -module Parser ( parseModule, parseExpr ) where +module Parser ( parseModule, parseStmt, parseIdentifier, parseIface ) where + +#include "HsVersions.h" import HsSyn import HsTypes ( mkHsTupCon ) -import HsPat ( InPat(..) ) import RdrHsSyn +import HscTypes ( ParsedIface(..), IsBootInterface, noDependencies ) import Lex -import ParseUtil import RdrName -import PrelNames -import OccName ( UserFS, varName, ipName, tcName, dataName, tcClsName, tvName ) +import PrelNames ( mAIN_Name, funTyConName, listTyConName, + parrTyConName, consDataConName ) +import TysWiredIn ( unitTyCon, unitDataCon, tupleTyCon, tupleCon, nilDataCon ) +import ForeignCall ( Safety(..), CExportSpec(..), + CCallConv(..), CCallTarget(..), defaultCCallConv, + ) +import OccName ( UserFS, varName, tcName, dataName, tcClsName, tvName ) +import TyCon ( DataConDetails(..) ) +import DataCon ( DataCon, dataConName ) import SrcLoc ( SrcLoc ) import Module -import CallConv -import CmdLineOpts ( opt_SccProfilingOn ) -import BasicTypes ( Boxity(..), Fixity(..), FixityDirection(..), NewOrData(..) ) +import CmdLineOpts ( opt_SccProfilingOn, opt_InPackage ) +import Type ( Kind, mkArrowKind, liftedTypeKind ) +import BasicTypes ( Boxity(..), Fixity(..), FixityDirection(..), IPName(..), + NewOrData(..), StrictnessMark(..), Activation(..), + FixitySig(..) ) import Panic -import GlaExts -import FastString ( tailFS ) +import GLAEXTS +import CStrings ( CLabelString ) +import FastString +import Maybes ( orElse ) import Outputable -#include "HsVersions.h" } {- ----------------------------------------------------------------------------- -Conflicts: 14 shift/reduce - (note: it's currently 21 -- JRL, 31/1/2000) +Conflicts: 29 shift/reduce, [SDM 19/9/2002] -8 for abiguity in 'if x then y else z + 1' +10 for abiguity in 'if x then y else z + 1' [State 136] (shift parses as 'if x then y else (z + 1)', as per longest-parse rule) -1 for ambiguity in 'if x then y else z :: T' + 10 because op might be: : - ! * . `x` VARSYM CONSYM QVARSYM QCONSYM + +1 for ambiguity in 'if x then y else z with ?x=3' [State 136] + (shift parses as 'if x then y else (z with ?x=3)' + +1 for ambiguity in 'if x then y else z :: T' [State 136] (shift parses as 'if x then y else (z :: T)', as per longest-parse rule) -3 for ambiguity in 'case x of y :: a -> b' - (don't know whether to reduce 'a' as a btype or shift the '->'. - conclusion: bogus expression anyway, doesn't matter) -1 for ambiguity in '{-# RULES "name" forall = ... #-}' +8 for ambiguity in 'e :: a `b` c'. Does this mean [States 160,246] + (e::a) `b` c, or + (e :: (a `b` c)) + +1 for ambiguity in 'let ?x ...' [State 268] + the parser can't tell whether the ?x is the lhs of a normal binding or + an implicit binding. Fortunately resolving as shift gives it the only + sensible meaning, namely the lhs of an implicit binding. + +1 for ambiguity in '{-# RULES "name" [ ... #-} [State 332] + we don't know whether the '[' starts the activation or not: it + might be the start of the declaration with the activation being + empty. --SDM 1/4/2002 + +1 for ambiguity in '{-# RULES "name" forall = ... #-}' [State 394] 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 or the beginning of the rule itself. Resolving to shift means @@ -56,9 +82,9 @@ Conflicts: 14 shift/reduce This saves explicitly defining a grammar for the rule lhs that doesn't include 'forall'. -1 for ambiguity in 'x @ Rec{..}'. - Only sensible parse is 'x @ (Rec{..})', which is what resolving - to shift gives us. +6 for conflicts between `fdecl' and `fdeclDEPRECATED', [States 384,385] + which are resolved correctly, and moreover, + should go away when `fdeclDEPRECATED' is removed. ----------------------------------------------------------------------------- -} @@ -89,27 +115,35 @@ Conflicts: 14 shift/reduce 'then' { ITthen } 'type' { ITtype } 'where' { ITwhere } - '_scc_' { ITscc } + '_scc_' { ITscc } -- ToDo: remove 'forall' { ITforall } -- GHC extension keywords 'foreign' { ITforeign } 'export' { ITexport } 'label' { ITlabel } 'dynamic' { ITdynamic } + 'safe' { ITsafe } + 'threadsafe' { ITthreadsafe } 'unsafe' { ITunsafe } 'with' { ITwith } + 'mdo' { ITmdo } '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 } + 'proc' { ITproc } -- for arrow notation extension + 'rec' { ITrec } -- for arrow notation extension + '_ccall_' { ITccall (False, False, PlayRisky) } + '_ccall_GC_' { ITccall (False, False, PlaySafe False) } + '_casm_' { ITccall (False, True, PlayRisky) } + '_casm_GC_' { ITccall (False, True, PlaySafe False) } '{-# SPECIALISE' { ITspecialise_prag } '{-# SOURCE' { ITsource_prag } '{-# INLINE' { ITinline_prag } '{-# NOINLINE' { ITnoinline_prag } '{-# RULES' { ITrules_prag } + '{-# CORE' { ITcore_prag } -- hdaume: annotated core + '{-# SCC' { ITscc_prag } '{-# DEPRECATED' { ITdeprecated_prag } '#-}' { ITclose_prag } @@ -138,12 +172,13 @@ Conflicts: 14 shift/reduce '__A' { ITarity } '__P' { ITspecialise } '__C' { ITnocaf } - '__U' { ITunfold $$ } + '__U' { ITunfold } '__S' { ITstrict $$ } '__M' { ITcprinfo $$ } -} '..' { ITdotdot } -- reserved symbols + ':' { ITcolon } '::' { ITdcolon } '=' { ITequal } '\\' { ITlam } @@ -155,6 +190,11 @@ Conflicts: 14 shift/reduce '=>' { ITdarrow } '-' { ITminus } '!' { ITbang } + '*' { ITstar } + '-<' { ITlarrowtail } -- for arrow notation + '>-' { ITrarrowtail } -- for arrow notation + '-<<' { ITLarrowtail } -- for arrow notation + '>>-' { ITRarrowtail } -- for arrow notation '.' { ITdot } '{' { ITocurly } -- special symbols @@ -164,10 +204,14 @@ Conflicts: 14 shift/reduce vccurly { ITvccurly } -- virtual close curly (from layout) '[' { ITobrack } ']' { ITcbrack } + '[:' { ITopabrack } + ':]' { ITcpabrack } '(' { IToparen } ')' { ITcparen } '(#' { IToubxparen } '#)' { ITcubxparen } + '(|' { IToparenbar } + '|)' { ITcparenbar } ';' { ITsemi } ',' { ITcomma } '`' { ITbackquote } @@ -181,7 +225,8 @@ Conflicts: 14 shift/reduce QVARSYM { ITqvarsym $$ } QCONSYM { ITqconsym $$ } - IPVARID { ITipvarid $$ } -- GHC extension + IPDUPVARID { ITdupipvarid $$ } -- GHC extension + IPSPLITVARID { ITsplitipvarid $$ } -- GHC extension CHAR { ITchar $$ } STRING { ITstring $$ } @@ -194,11 +239,25 @@ Conflicts: 14 shift/reduce PRIMFLOAT { ITprimfloat $$ } PRIMDOUBLE { ITprimdouble $$ } CLITLIT { ITlitlit $$ } + +-- Template Haskell +'[|' { ITopenExpQuote } +'[p|' { ITopenPatQuote } +'[t|' { ITopenTypQuote } +'[d|' { ITopenDecQuote } +'|]' { ITcloseQuote } +ID_SPLICE { ITidEscape $$ } -- $x +'$(' { ITparenEscape } -- $( exp ) +REIFY_TYPE { ITreifyType } +REIFY_DECL { ITreifyDecl } +REIFY_FIXITY { ITreifyFixity } %monad { P } { thenP } { returnP } %lexer { lexer } { ITeof } %name parseModule module -%name parseExpr exp +%name parseStmt maybe_stmt +%name parseIdentifier identifier +%name parseIface iface %tokentype { Token } %% @@ -214,9 +273,9 @@ Conflicts: 14 shift/reduce module :: { RdrNameHsModule } : srcloc 'module' modid maybemoddeprec maybeexports 'where' body - { HsModule $3 Nothing $5 (fst $7) (snd $7) $4 $1 } + { HsModule (Just (mkHomeModule $3)) $5 (fst $7) (snd $7) $4 $1 } | srcloc body - { HsModule mAIN_Name Nothing Nothing (fst $2) (snd $2) Nothing $1 } + { HsModule Nothing Nothing (fst $2) (snd $2) Nothing $1 } maybemoddeprec :: { Maybe DeprecTxt } : '{-# DEPRECATED' STRING '#-}' { Just $2 } @@ -232,7 +291,42 @@ top :: { ([RdrNameImportDecl], [RdrNameHsDecl]) } | cvtopdecls { ([],$1) } cvtopdecls :: { [RdrNameHsDecl] } - : topdecls { cvTopDecls (groupBindings $1)} + : topdecls { cvTopDecls $1 } + +----------------------------------------------------------------------------- +-- Interfaces (.hi-boot files) + +iface :: { ParsedIface } + : 'module' modid 'where' ifacebody + { ParsedIface { + pi_mod = $2, + pi_pkg = opt_InPackage, + pi_vers = 1, -- Module version + pi_orphan = False, + pi_exports = (1,[($2,mkIfaceExports $4)]), + pi_deps = noDependencies, + pi_usages = [], + pi_fixity = [], + pi_insts = [], + pi_decls = map (\x -> (1,x)) $4, + pi_rules = (1,[]), + pi_deprecs = Nothing + } + } + +ifacebody :: { [RdrNameTyClDecl] } + : '{' ifacedecls '}' { $2 } + | layout_on ifacedecls close { $2 } + +ifacedecls :: { [RdrNameTyClDecl] } + : ifacedecl ';' ifacedecls { $1 : $3 } + | ';' ifacedecls { $2 } + | ifacedecl { [$1] } + | {- empty -} { [] } + +ifacedecl :: { RdrNameTyClDecl } + : tycl_decl { $1 } + | srcloc var '::' sigtype { IfaceSig $2 $4 [] $1 } ----------------------------------------------------------------------------- -- The Export List @@ -247,20 +341,21 @@ exportlist :: { [RdrNameIE] } | export { [$1] } | {- empty -} { [] } - -- GHC extension: we allow things like [] and (,,,) to be exported + -- No longer allow things like [] and (,,,) to be exported + -- They are built in syntax, always available export :: { RdrNameIE } : qvar { IEVar $1 } - | gtycon { IEThingAbs $1 } - | gtycon '(' '..' ')' { IEThingAll $1 } - | gtycon '(' ')' { IEThingWith $1 [] } - | gtycon '(' qcnames ')' { IEThingWith $1 (reverse $3) } + | oqtycon { IEThingAbs $1 } + | oqtycon '(' '..' ')' { IEThingAll $1 } + | oqtycon '(' ')' { IEThingWith $1 [] } + | oqtycon '(' qcnames ')' { IEThingWith $1 (reverse $3) } | 'module' modid { IEModuleContents $2 } qcnames :: { [RdrName] } : qcnames ',' qcname { $3 : $1 } | qcname { [$1] } -qcname :: { RdrName } +qcname :: { RdrName } -- Variable or data constructor : qvar { $1 } | gcon { $1 } @@ -277,12 +372,12 @@ 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 } - | {- empty -} { ImportByUser } +maybe_src :: { IsBootInterface } + : '{-# SOURCE' '#-}' { True } + | {- empty -} { False } optqualified :: { Bool } : 'qualified' { True } @@ -305,8 +400,7 @@ impspec :: { (Bool, [RdrNameIE]) } prec :: { Int } : {- empty -} { 9 } - | INTEGER {% checkPrec $1 `thenP_` - returnP (fromInteger $1) } + | INTEGER {% checkPrecP (fromInteger $1) } infix :: { FixityDirection } : 'infix' { InfixN } @@ -320,110 +414,115 @@ ops :: { [RdrName] } ----------------------------------------------------------------------------- -- Top-Level Declarations -topdecls :: { [RdrBinding] } - : topdecls ';' topdecl { ($3 : $1) } +topdecls :: { [RdrBinding] } -- Reversed + : topdecls ';' topdecl { $3 : $1 } | topdecls ';' { $1 } | topdecl { [$1] } topdecl :: { RdrBinding } - : srcloc 'type' simpletype '=' sigtype - { RdrHsDecl (TyClD (TySynonym (fst $3) (snd $3) $5 $1)) } - - | 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))) } - - | srcloc 'newtype' ctype '=' newconstr deriving - {% checkDataHeader $3 `thenP` \(cs,c,ts) -> - returnP (RdrHsDecl (TyClD - (mkTyData NewType cs c ts [$5] 1 $6 $1))) } - - | srcloc 'class' ctype fds where - {% checkDataHeader $3 `thenP` \(cs,c,ts) -> - let - (binds,sigs) = cvMonoBindsAndSigs cvClassOpSig (groupBindings $5) - in - returnP (RdrHsDecl (TyClD - (mkClassDecl cs c ts $4 sigs (Just binds) $1))) } - + : tycl_decl { RdrHsDecl (TyClD $1) } | srcloc 'instance' inst_type where - { let (binds,sigs) - = cvMonoBindsAndSigs cvInstDeclSig - (groupBindings $4) + { let (binds,sigs) = cvMonoBindsAndSigs $4 in RdrHsDecl (InstD (InstDecl $3 binds sigs Nothing $1)) } + | srcloc 'default' '(' comma_types0 ')' { RdrHsDecl (DefD (DefaultDecl $4 $1)) } + | 'foreign' fdecl { RdrHsDecl $2 } + | '{-# DEPRECATED' deprecations '#-}' { RdrBindings (reverse $2) } + | '{-# RULES' rules '#-}' { RdrBindings (reverse $2) } + | srcloc '$(' exp ')' { RdrHsDecl (SpliceD (SpliceDecl $3 $1)) } + | decl { $1 } - | srcloc 'default' '(' types0 ')' - { RdrHsDecl (DefD (DefaultDecl $4 $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)) } - - | 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)) } +tycl_decl :: { RdrNameTyClDecl } + : srcloc 'type' syn_hdr '=' ctype + -- Note ctype, not sigtype. + -- 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 + { let (tc,tvs) = $3 in TySynonym tc tvs $5 $1 } + + + | srcloc 'data' tycl_hdr constrs deriving + { mkTyData DataType $3 (DataCons (reverse $4)) $5 $1 } + + | srcloc 'newtype' tycl_hdr '=' newconstr deriving + { mkTyData NewType $3 (DataCons [$5]) $6 $1 } + + | srcloc 'class' tycl_hdr fds where + { let + (binds,sigs) = cvMonoBindsAndSigs $5 + in + mkClassDecl $3 $4 sigs (Just binds) $1 } + +syn_hdr :: { (RdrName, [RdrNameHsTyVar]) } -- We don't retain the syntax of an infix + -- type synonym declaration. Oh well. + : tycon tv_bndrs { ($1, $2) } + | tv_bndr tyconop tv_bndr { ($2, [$1,$3]) } + +-- tycl_hdr parses the header of a type or class decl, +-- which takes the form +-- T a b +-- Eq a => T a +-- (Eq a, Ord b) => T a b +-- Rather a lot of inlining here, else we get reduce/reduce errors +tycl_hdr :: { (RdrNameContext, RdrName, [RdrNameHsTyVar]) } + : context '=>' type {% checkTyClHdr $3 `thenP` \ (tc,tvs) -> + returnP ($1, tc, tvs) } + | type {% checkTyClHdr $1 `thenP` \ (tc,tvs) -> + returnP ([], tc, tvs) } - | '{-# DEPRECATED' deprecations '#-}' { $2 } - | '{-# RULES' rules '#-}' { $2 } - | decl { $1 } +----------------------------------------------------------------------------- +-- Nested declarations -decls :: { [RdrBinding] } +decls :: { [RdrBinding] } -- Reversed : decls ';' decl { $3 : $1 } | decls ';' { $1 } | decl { [$1] } | {- empty -} { [] } -decl :: { RdrBinding } - : fixdecl { $1 } - | valdef { $1 } - | '{-# INLINE' srcloc opt_phase qvar '#-}' { RdrSig (InlineSig $4 $3 $2) } - | '{-# NOINLINE' srcloc opt_phase qvar '#-}' { RdrSig (NoInlineSig $4 $3 $2) } - | '{-# SPECIALISE' srcloc qvar '::' sigtypes '#-}' - { foldr1 RdrAndBindings - (map (\t -> RdrSig (SpecSig $3 t $2)) $5) } - | '{-# SPECIALISE' srcloc 'instance' inst_type '#-}' - { RdrSig (SpecInstSig $4 $2) } - -opt_phase :: { Maybe Int } - : INTEGER { Just (fromInteger $1) } - | {- empty -} { Nothing } -wherebinds :: { RdrNameHsBinds } - : where { cvBinds cvValSig (groupBindings $1) } +decllist :: { [RdrBinding] } -- Reversed + : '{' decls '}' { $2 } + | layout_on decls close { $2 } -where :: { [RdrBinding] } +where :: { [RdrBinding] } -- Reversed + -- No implicit parameters : 'where' decllist { $2 } | {- empty -} { [] } -declbinds :: { RdrNameHsBinds } - : decllist { cvBinds cvValSig (groupBindings $1) } +binds :: { RdrNameHsBinds } -- May have implicit parameters + : decllist { cvBinds $1 } + | '{' dbinds '}' { IPBinds $2 False{-not with-} } + | layout_on dbinds close { IPBinds $2 False{-not with-} } + +wherebinds :: { RdrNameHsBinds } -- May have implicit parameters + : 'where' binds { $2 } + | {- empty -} { EmptyBinds } -decllist :: { [RdrBinding] } - : '{' decls '}' { $2 } - | layout_on decls close { $2 } -fixdecl :: { RdrBinding } - : srcloc infix prec ops { foldr1 RdrAndBindings - [ RdrSig (FixSig (FixitySig n - (Fixity $3 $2) $1)) - | n <- $4 ] } ----------------------------------------------------------------------------- -- Transformation Rules -rules :: { RdrBinding } - : rules ';' rule { $1 `RdrAndBindings` $3 } +rules :: { [RdrBinding] } -- Reversed + : rules ';' rule { $3 : $1 } | rules ';' { $1 } - | rule { $1 } - | {- empty -} { RdrNullBind } + | rule { [$1] } + | {- empty -} { [] } rule :: { RdrBinding } - : STRING rule_forall fexp '=' srcloc exp - { RdrHsDecl (RuleD (HsRule $1 [] $2 $3 $6 $5)) } + : STRING activation rule_forall infixexp '=' srcloc exp + { RdrHsDecl (RuleD (HsRule $1 $2 $3 $4 $7 $6)) } + +activation :: { Activation } -- Omitted means AlwaysActive + : {- empty -} { AlwaysActive } + | explicit_activation { $1 } + +inverse_activation :: { Activation } -- Omitted means NeverActive + : {- empty -} { NeverActive } + | explicit_activation { $1 } + +explicit_activation :: { Activation } -- In brackets + : '[' INTEGER ']' { ActiveAfter (fromInteger $2) } + | '[' '~' INTEGER ']' { ActiveBefore (fromInteger $3) } rule_forall :: { [RdrNameRuleBndr] } : 'forall' rule_var_list '.' { $2 } @@ -438,36 +537,166 @@ rule_var :: { RdrNameRuleBndr } | '(' varid '::' ctype ')' { RuleBndrSig $2 $4 } ----------------------------------------------------------------------------- --- Deprecations +-- Deprecations (c.f. rules) -deprecations :: { RdrBinding } - : deprecations ';' deprecation { $1 `RdrAndBindings` $3 } - | deprecations ';' { $1 } - | deprecation { $1 } - | {- empty -} { RdrNullBind } +deprecations :: { [RdrBinding] } -- Reversed + : deprecations ';' deprecation { $3 : $1 } + | deprecations ';' { $1 } + | deprecation { [$1] } + | {- empty -} { [] } -- SUP: TEMPORARY HACK, not checking for `module Foo' deprecation :: { RdrBinding } : srcloc depreclist STRING - { foldr RdrAndBindings RdrNullBind + { RdrBindings [ RdrHsDecl (DeprecD (Deprecation n $3 $1)) | n <- $2 ] } ------------------------------------------------------------------------------ --- Foreign import/export - -callconv :: { Int } - : 'stdcall' { stdCallConv } - | 'ccall' { cCallConv } - | {- empty -} { defaultCallConv } - -unsafe_flag :: { Bool } - : 'unsafe' { True } - | {- empty -} { False } -ext_name :: { Maybe ExtName } - : 'dynamic' { Just Dynamic } - | STRING { Just (ExtName $1 Nothing) } - | STRING STRING { Just (ExtName $2 (Just $1)) } +----------------------------------------------------------------------------- +-- 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 :: { RdrNameHsDecl } +fdecl : srcloc 'import' callconv safety1 fspec {% mkImport $3 $4 $5 $1 } + | srcloc 'import' callconv fspec {% mkImport $3 (PlaySafe False) $4 $1 } + | srcloc 'export' callconv fspec {% mkExport $3 $4 $1 } + -- the following syntax is DEPRECATED + | srcloc fdecl1DEPRECATED { ForD ($2 True $1) } + | srcloc fdecl2DEPRECATED { $2 $1 } + +fdecl1DEPRECATED :: { Bool -> SrcLoc -> ForeignDecl RdrName } +fdecl1DEPRECATED + ----------- DEPRECATED label decls ------------ + : 'label' ext_name varid '::' sigtype + { ForeignImport $3 $5 (CImport defaultCCallConv (PlaySafe False) nilFS nilFS + (CLabel ($2 `orElse` mkExtName $3))) } + + ----------- 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 $4) + in + ForeignImport $4 $6 (CImport defaultCCallConv $3 nilFS nilFS + (CFunction target)) } + + -- 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 "Illegal format of .NET foreign import" + CCall cconv -> returnP $ + let + imp = CFunction (StaticTarget $4) + in + ForeignImport $6 $8 (CImport cconv $5 nilFS nilFS imp) } + + -- DEPRECATED variant #3: `unsafe' after entity + | 'import' callconv STRING 'unsafe' varid_no_unsafe '::' sigtype + {% case $2 of + DNCall -> parseError "Illegal format of .NET foreign import" + CCall cconv -> returnP $ + let + imp = CFunction (StaticTarget $3) + in + ForeignImport $5 $7 (CImport cconv PlayRisky nilFS nilFS imp) } + + -- DEPRECATED variant #4: use of the special identifier `dynamic' without + -- an explicit calling convention (import) + | 'import' {-no callconv-} 'dynamic' safety varid_no_unsafe '::' sigtype + { ForeignImport $4 $6 (CImport defaultCCallConv $3 nilFS nilFS + (CFunction DynamicTarget)) } + + -- DEPRECATED variant #5: use of the special identifier `dynamic' (import) + | 'import' callconv 'dynamic' safety varid_no_unsafe '::' sigtype + {% case $2 of + DNCall -> parseError "Illegal format of .NET foreign import" + CCall cconv -> returnP $ + ForeignImport $5 $7 (CImport cconv $4 nilFS nilFS + (CFunction DynamicTarget)) } + + -- DEPRECATED variant #6: lack of a calling convention specification + -- (export) + | 'export' {-no callconv-} ext_name varid '::' sigtype + { ForeignExport $3 $5 (CExport (CExportStatic ($2 `orElse` mkExtName $3) + defaultCCallConv)) } + + -- 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 "Illegal format of .NET foreign import" + CCall cconv -> returnP $ + ForeignExport $5 $7 + (CExport (CExportStatic $4 cconv)) } + + -- DEPRECATED variant #8: use of the special identifier `dynamic' without + -- an explicit calling convention (export) + | 'export' {-no callconv-} 'dynamic' varid '::' sigtype + { ForeignImport $3 $5 (CImport defaultCCallConv (PlaySafe False) nilFS nilFS + CWrapper) } + + -- DEPRECATED variant #9: use of the special identifier `dynamic' (export) + | 'export' callconv 'dynamic' varid '::' sigtype + {% case $2 of + DNCall -> parseError "Illegal format of .NET foreign import" + CCall cconv -> returnP $ + ForeignImport $4 $6 (CImport cconv (PlaySafe False) nilFS nilFS CWrapper) } + + ----------- DEPRECATED .NET decls ------------ + -- NB: removed the .NET call declaration, as it is entirely subsumed + -- by the new standard FFI declarations + +fdecl2DEPRECATED :: { SrcLoc -> RdrNameHsDecl } +fdecl2DEPRECATED + : 'import' 'dotnet' 'type' ext_name tycon + { \loc -> TyClD (ForeignType $5 $4 DNType loc) } + -- left this one unchanged for the moment as type imports are not + -- covered currently by the FFI standard -=chak + + +callconv :: { CallConv } + : 'stdcall' { CCall StdCallConv } + | 'ccall' { CCall CCallConv } + | 'dotnet' { DNCall } + +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 :: { (FastString, RdrName, RdrNameHsType) } + : STRING var '::' sigtype { ($1 , $2, $4) } + | var '::' sigtype { (nilFS, $1, $3) } + -- if the entity string is missing, it defaults to the empty string; + -- the meaning of an empty entity string depends on the calling + -- convention + +-- DEPRECATED syntax +ext_name :: { Maybe CLabelString } + : STRING { Just $1 } + | STRING STRING { Just $2 } -- Ignore "module name" for now | {- empty -} { Nothing } @@ -487,7 +716,7 @@ sigtypes :: { [RdrNameHsType] } | sigtypes ',' sigtype { $3 : $1 } sigtype :: { RdrNameHsType } - : ctype { (mkHsForAllTy Nothing [] $1) } + : ctype { mkHsForAllTy Nothing [] $1 } sig_vars :: { [RdrName] } : sig_vars ',' var { $3 : $1 } @@ -498,32 +727,41 @@ sig_vars :: { [RdrName] } -- A ctype is a for-all type ctype :: { RdrNameHsType } - : 'forall' tyvars '.' ctype { mkHsForAllTy (Just $2) [] $4 } - | context type { mkHsForAllTy Nothing $1 $2 } + : 'forall' tv_bndrs '.' ctype { mkHsForAllTy (Just $2) [] $4 } + | context '=>' type { mkHsForAllTy Nothing $1 $3 } -- A type of form (context => type) is an *implicit* HsForAllTy | type { $1 } +-- We parse a context as a btype so that we don't get reduce/reduce +-- errors in ctype. The basic problem is that +-- (Eq a, Ord a) +-- looks so much like a tuple type. We can't tell until we find the => +context :: { RdrNameContext } + : btype {% checkContext $1 } + type :: { RdrNameHsType } - : gentype '->' type { HsFunTy $1 $3 } - | ipvar '::' type { mkHsIParamTy $1 $3 } + : ipvar '::' gentype { mkHsIParamTy $1 $3 } | gentype { $1 } gentype :: { RdrNameHsType } : btype { $1 } --- Generics - | atype tyconop atype { HsOpTy $1 $2 $3 } + | btype qtyconop gentype { HsOpTy $1 (HsTyOp $2) $3 } + | btype '`' tyvar '`' gentype { HsOpTy $1 (HsTyOp $3) $5 } + | btype '->' gentype { HsOpTy $1 HsArrow $3 } btype :: { RdrNameHsType } - : btype atype { (HsAppTy $1 $2) } + : btype atype { HsAppTy $1 $2 } | atype { $1 } atype :: { RdrNameHsType } : gtycon { HsTyVar $1 } | tyvar { HsTyVar $1 } - | '(' type ',' types ')' { HsTupleTy (mkHsTupCon tcName Boxed ($2:$4)) ($2 : reverse $4) } - | '(#' types '#)' { HsTupleTy (mkHsTupCon tcName Unboxed $2) (reverse $2) } - | '[' type ']' { HsListTy $2 } - | '(' ctype ')' { $2 } + | '(' type ',' comma_types1 ')' { HsTupleTy (mkHsTupCon tcName Boxed ($2:$4)) ($2:$4) } + | '(#' comma_types1 '#)' { HsTupleTy (mkHsTupCon tcName Unboxed $2) $2 } + | '[' type ']' { HsListTy $2 } + | '[:' type ':]' { HsPArrTy $2 } + | '(' ctype ')' { HsParTy $2 } + | '(' ctype '::' kind ')' { HsKindSig $2 $4 } -- Generics | INTEGER { HsNumTy $1 } @@ -534,20 +772,21 @@ atype :: { RdrNameHsType } inst_type :: { RdrNameHsType } : ctype {% checkInstType $1 } -types0 :: { [RdrNameHsType] } - : types { $1 } +comma_types0 :: { [RdrNameHsType] } + : comma_types1 { $1 } | {- empty -} { [] } -types :: { [RdrNameHsType] } +comma_types1 :: { [RdrNameHsType] } : type { [$1] } - | types ',' type { $3 : $1 } + | type ',' comma_types1 { $1 : $3 } -simpletype :: { (RdrName, [RdrNameHsTyVar]) } - : tycon tyvars { ($1, reverse $2) } +tv_bndrs :: { [RdrNameHsTyVar] } + : tv_bndr tv_bndrs { $1 : $2 } + | {- empty -} { [] } -tyvars :: { [RdrNameHsTyVar] } - : tyvars tyvar { UserTyVar $2 : $1 } - | {- empty -} { [] } +tv_bndr :: { RdrNameHsTyVar } + : tyvar { UserTyVar $1 } + | '(' tyvar '::' kind ')' { IfaceTyVar $2 $4 } fds :: { [([RdrName], [RdrName])] } : {- empty -} { [] } @@ -565,44 +804,58 @@ varids0 :: { [RdrName] } | varids0 tyvar { $2 : $1 } ----------------------------------------------------------------------------- +-- Kinds + +kind :: { Kind } + : akind { $1 } + | akind '->' kind { mkArrowKind $1 $3 } + +akind :: { Kind } + : '*' { liftedTypeKind } + | '(' kind ')' { $2 } + + +----------------------------------------------------------------------------- -- Datatype declarations newconstr :: { RdrNameConDecl } - : srcloc conid atype { mkConDecl $2 [] [] (VanillaCon [Unbanged $3]) $1 } - | srcloc conid '{' var '::' type '}' - { mkConDecl $2 [] [] (RecCon [([$4], Unbanged $6)]) $1 } + : srcloc conid atype { ConDecl $2 [] [] (PrefixCon [unbangedType $3]) $1 } + | srcloc conid '{' var '::' ctype '}' + { ConDecl $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 } - : srcloc forall context constr_stuff - { mkConDecl (fst $4) $2 $3 (snd $4) $1 } + : srcloc forall context '=>' constr_stuff + { ConDecl (fst $5) $2 $3 (snd $5) $1 } | srcloc forall constr_stuff - { mkConDecl (fst $3) $2 [] (snd $3) $1 } + { ConDecl (fst $3) $2 [] (snd $3) $1 } forall :: { [RdrNameHsTyVar] } - : 'forall' tyvars '.' { $2 } + : 'forall' tv_bndrs '.' { $2 } | {- empty -} { [] } -context :: { RdrNameContext } - : btype '=>' {% checkContext $1 } - constr_stuff :: { (RdrName, RdrNameConDetails) } - : btype {% mkVanillaCon $1 [] } - | btype '!' atype satypes {% mkVanillaCon $1 (Banged $3 : $4) } - | gtycon '{' fielddecls '}' {% mkRecCon $1 $3 } + : btype {% mkPrefixCon $1 [] } + | btype '!' atype satypes {% mkPrefixCon $1 (BangType MarkedUserStrict $3 : $4) } + | oqtycon '{' '}' {% mkRecCon $1 [] } + | oqtycon '{' 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 } @@ -612,18 +865,14 @@ 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] } +deriving :: { Maybe RdrNameContext } : {- empty -} { Nothing } - | 'deriving' qtycls { Just [$2] } - | 'deriving' '(' ')' { Just [] } - | 'deriving' '(' dclasses ')' { Just (reverse $3) } - -dclasses :: { [RdrName] } - : dclasses ',' qtycls { $3 : $1 } - | qtycls { [$1] } + | 'deriving' context { Just $2 } + -- Glasgow extension: allow partial + -- applications in derivings ----------------------------------------------------------------------------- -- Value definitions @@ -648,32 +897,48 @@ dclasses :: { [RdrName] } We can't tell whether to reduce var to qvar until after we've read the signatures. -} -valdef :: { RdrBinding } - : infixexp srcloc opt_sig rhs {% (checkValDef $1 $3 $4 $2) } - | infixexp srcloc '::' sigtype {% (checkValSig $1 $4 $2) } - | var ',' sig_vars srcloc '::' sigtype { foldr1 RdrAndBindings - [ RdrSig (Sig n $6 $4) | n <- $1:$3 ] - } - +decl :: { RdrBinding } + : sigdecl { $1 } + | infixexp srcloc opt_sig rhs {% checkValDef $1 $3 $4 $2 } 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 } + +sigdecl :: { RdrBinding } + : infixexp srcloc '::' sigtype + {% checkValSig $1 $4 $2 } + -- See the above notes for why we need infixexp here + | var ',' sig_vars srcloc '::' sigtype + { mkSigDecls [ Sig n $6 $4 | n <- $1:$3 ] } + | srcloc infix prec ops { mkSigDecls [ FixSig (FixitySig n (Fixity $3 $2) $1) + | n <- $4 ] } + | '{-# INLINE' srcloc activation qvar '#-}' + { RdrHsDecl (SigD (InlineSig True $4 $3 $2)) } + | '{-# NOINLINE' srcloc inverse_activation qvar '#-}' + { RdrHsDecl (SigD (InlineSig False $4 $3 $2)) } + | '{-# SPECIALISE' srcloc qvar '::' sigtypes '#-}' + { mkSigDecls [ SpecSig $3 t $2 | t <- $5] } + | '{-# SPECIALISE' srcloc 'instance' inst_type '#-}' + { RdrHsDecl (SigD (SpecInstSig $4 $2)) } ----------------------------------------------------------------------------- -- Expressions exp :: { RdrNameHsExpr } - : infixexp '::' sigtype { (ExprWithTySig $1 $3) } - | infixexp 'with' dbinding { HsWith $1 $3 } + : infixexp '::' sigtype { ExprWithTySig $1 $3 } + | infixexp 'with' dbinding { HsLet (IPBinds $3 True{-not a let-}) $1 } + | fexp srcloc '-<' exp { HsArrApp $1 $4 placeHolderType HsFirstOrderApp True $2 } + | fexp srcloc '>-' exp { HsArrApp $4 $1 placeHolderType HsFirstOrderApp False $2 } + | fexp srcloc '-<<' exp { HsArrApp $1 $4 placeHolderType HsHigherOrderApp True $2 } + | fexp srcloc '>>-' exp { HsArrApp $4 $1 placeHolderType HsHigherOrderApp False $2 } | infixexp { $1 } infixexp :: { RdrNameHsExpr } @@ -682,29 +947,43 @@ infixexp :: { RdrNameHsExpr } (panic "fixity") $3 )} exp10 :: { RdrNameHsExpr } - : '\\' aexp aexps opt_asig '->' srcloc exp - {% checkPatterns ($2 : reverse $3) `thenP` \ ps -> - returnP (HsLam (Match [] ps $4 - (GRHSs (unguardedRHS $7 $6) - EmptyBinds Nothing))) } - | 'let' declbinds 'in' exp { HsLet $2 $4 } + : '\\' srcloc aexp aexps opt_asig '->' srcloc exp + {% checkPatterns $2 ($3 : reverse $4) `thenP` \ ps -> + returnP (HsLam (Match ps $5 + (GRHSs (unguardedRHS $8 $7) + EmptyBinds placeHolderType))) } + | 'let' binds '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 DoStmt $3 $1 } + | srcloc 'do' stmtlist {% checkDo $3 `thenP` \ stmts -> + returnP (mkHsDo DoExpr stmts $1) } + | srcloc 'mdo' stmtlist {% checkMDo $3 `thenP` \ stmts -> + returnP (mkHsDo MDoExpr 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) False placeHolderType } + | '_casm_' CLITLIT aexps0 { HsCCall $2 $3 PlayRisky True placeHolderType } + | '_casm_GC_' CLITLIT aexps0 { HsCCall $2 $3 (PlaySafe False) True placeHolderType } - | '_scc_' STRING exp { if opt_SccProfilingOn - then HsSCC $2 $3 - else HsPar $3 } + | scc_annot exp { if opt_SccProfilingOn + then HsSCC $1 $2 + else HsPar $2 } + | 'proc' srcloc aexp '->' srcloc exp + {% checkPattern $2 $3 `thenP` \ p -> + returnP (HsProc p (HsCmdTop $6 [] placeHolderType undefined) $5) } + + | '{-# CORE' STRING '#-}' exp { HsCoreAnn $2 $4 } -- hdaume: core annotation + + | reifyexp { HsReify $1 } | fexp { $1 } -ccallid :: { FAST_STRING } +scc_annot :: { FastString } + : '_scc_' STRING { $2 } + | '{-# SCC' STRING '#-}' { $2 } + +ccallid :: { FastString } : VARID { $1 } | CONID { $1 } @@ -712,38 +991,71 @@ fexp :: { RdrNameHsExpr } : fexp aexp { (HsApp $1 $2) } | aexp { $1 } +reifyexp :: { HsReify RdrName } + : REIFY_DECL gtycon { Reify ReifyDecl $2 } + | REIFY_DECL qvar { Reify ReifyDecl $2 } + | REIFY_TYPE qcname { Reify ReifyType $2 } + | REIFY_FIXITY qcname { Reify ReifyFixity $2 } + aexps0 :: { [RdrNameHsExpr] } - : aexps { (reverse $1) } + : aexps { reverse $1 } aexps :: { [RdrNameHsExpr] } : aexps aexp { $2 : $1 } | {- empty -} { [] } aexp :: { RdrNameHsExpr } - : var_or_con '{|' gentype '|}' { (HsApp $1 (HsType $3)) } - | aexp '{' fbinds '}' {% (mkRecConstrOrUpdate $1 - (reverse $3)) } - | aexp1 { $1 } - -var_or_con :: { RdrNameHsExpr } - : qvar { HsVar $1 } - | gcon { HsVar $1 } + : qvar '@' aexp { EAsPat $1 $3 } + | '~' aexp { ELazyPat $2 } + | aexp1 { $1 } aexp1 :: { RdrNameHsExpr } + : aexp1 '{' fbinds '}' {% (mkRecConstrOrUpdate $1 (reverse $3)) } + | aexp2 { $1 } + +-- Here was the syntax for type applications that I was planning +-- but there are difficulties (e.g. what order for type args) +-- so it's not enabled yet. + | qcname '{|' gentype '|}' { (HsApp (HsVar $1) (HsType $3)) } + +aexp2 :: { RdrNameHsExpr } : ipvar { HsIPVar $1 } - | var_or_con { $1 } + | qcname { HsVar $1 } | literal { HsLit $1 } - | INTEGER { HsOverLit (HsIntegral $1 fromInteger_RDR) } - | RATIONAL { HsOverLit (HsFractional $1 fromRational_RDR) } + | INTEGER { HsOverLit (mkHsIntegral $1) } + | RATIONAL { HsOverLit (mkHsFractional $1) } | '(' exp ')' { HsPar $2 } | '(' exp ',' texps ')' { ExplicitTuple ($2 : reverse $4) Boxed} | '(#' texps '#)' { ExplicitTuple (reverse $2) Unboxed } | '[' list ']' { $2 } + | '[:' parr ':]' { $2 } | '(' infixexp qop ')' { (SectionL $2 (HsVar $3)) } | '(' qopm infixexp ')' { (SectionR $2 $3) } - | qvar '@' aexp { EAsPat $1 $3 } | '_' { EWildPat } - | '~' aexp1 { ELazyPat $2 } + + -- MetaHaskell Extension + | srcloc ID_SPLICE { mkHsSplice (HsVar (mkUnqual varName $2)) $1 } -- $x + | srcloc '$(' exp ')' { mkHsSplice $3 $1 } -- $( exp ) + | srcloc '[|' exp '|]' { HsBracket (ExpBr $3) $1 } + | srcloc '[t|' ctype '|]' { HsBracket (TypBr $3) $1 } + | srcloc '[p|' infixexp '|]' {% checkPattern $1 $3 `thenP` \p -> + returnP (HsBracket (PatBr p) $1) } + | srcloc '[d|' cvtopbody '|]' { HsBracket (DecBr (mkGroup $3)) $1 } + + -- arrow notation extension + | srcloc '(|' aexp2 cmdargs '|)' + { HsArrForm $3 Nothing (reverse $4) $1 } + +cmdargs :: { [RdrNameHsCmdTop] } + : cmdargs acmd { $2 : $1 } + | {- empty -} { [] } + +acmd :: { RdrNameHsCmdTop } + : aexp2 { HsCmdTop $1 [] placeHolderType undefined } + +cvtopbody :: { [RdrNameHsDecl] } + : '{' cvtopdecls '}' { $2 } + | layout_on cvtopdecls close { $2 } texps :: { [RdrNameHsExpr] } : texps ',' exp { $3 : $1 } @@ -757,19 +1069,15 @@ 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) } | exp ',' exp '..' exp { ArithSeqIn (FromThenTo $1 $3 $5) } - | exp srcloc pquals {% let { body [qs] = qs; - body qss = [ParStmt (map reverse qss)] } - in - returnP ( HsDo ListComp - (reverse (ReturnStmt $1 : body $3)) - $2 - ) + | exp srcloc pquals { mkHsDo ListComp + (reverse (ResultStmt $1 $2 : $3)) + $2 } lexps :: { [RdrNameHsExpr] } @@ -779,19 +1087,44 @@ lexps :: { [RdrNameHsExpr] } ----------------------------------------------------------------------------- -- List Comprehensions -pquals :: { [[RdrNameStmt]] } - : pquals '|' quals { $3 : $1 } +pquals :: { [RdrNameStmt] } -- Either a singleton ParStmt, or a reversed list of Stmts + : pquals1 { case $1 of + [qs] -> qs + qss -> [ParStmt stmtss] + where + stmtss = [ (reverse qs, undefined) + | qs <- qss ] + } + +pquals1 :: { [[RdrNameStmt]] } + : pquals1 '|' quals { $3 : $1 } | '|' quals { [$2] } quals :: { [RdrNameStmt] } : quals ',' qual { $3 : $1 } | qual { [$1] } -qual :: { RdrNameStmt } - : srcloc infixexp '<-' exp {% checkPattern $2 `thenP` \p -> - returnP (BindStmt p $4 $1) } - | srcloc exp { GuardStmt $2 $1 } - | srcloc 'let' declbinds { LetStmt $3 } +----------------------------------------------------------------------------- +-- Parallel array expressions + +-- The rules below are little bit contorted; see the list case for details. +-- Note that, in contrast to lists, we only have finite arithmetic sequences. +-- Moreover, we allow explicit arrays with no element (represented by the nil +-- constructor in the list case). + +parr :: { RdrNameHsExpr } + : { ExplicitPArr placeHolderType [] } + | exp { ExplicitPArr placeHolderType [$1] } + | lexps { ExplicitPArr placeHolderType + (reverse $1) } + | exp '..' exp { PArrSeqIn (FromTo $1 $3) } + | exp ',' exp '..' exp { PArrSeqIn (FromThenTo $1 $3 $5) } + | exp srcloc pquals { mkHsDo PArrComp + (reverse (ResultStmt $1 $2 : $3)) + $2 + } + +-- We are reusing `lexps' and `pquals' from the list case. ----------------------------------------------------------------------------- -- Case alternatives @@ -810,47 +1143,60 @@ alts1 :: { [RdrNameMatch] } | alt { [$1] } alt :: { RdrNameMatch } - : infixexp opt_sig ralt wherebinds - {% (checkPattern $1 `thenP` \p -> - returnP (Match [] [p] $2 - (GRHSs $3 $4 Nothing)) )} + : srcloc infixexp opt_sig ralt wherebinds + {% (checkPattern $1 $2 `thenP` \p -> + returnP (Match [p] $3 + (GRHSs $4 $5 placeHolderType)) )} ralt :: { [RdrNameGRHS] } - : '->' srcloc exp { [GRHS [ExprStmt $3 $2] $2] } - | gdpats { (reverse $1) } + : '->' srcloc exp { [GRHS [ResultStmt $3 $2] $2] } + | gdpats { reverse $1 } gdpats :: { [RdrNameGRHS] } : gdpats gdpat { $2 : $1 } | 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. +maybe_stmt :: { Maybe RdrNameStmt } + : stmt { Just $1 } + | {- nothing -} { Nothing } stmt :: { RdrNameStmt } - : srcloc infixexp '<-' exp {% checkPattern $2 `thenP` \p -> + : qual { $1 } + | srcloc infixexp '->' exp {% checkPattern $1 $4 `thenP` \p -> + returnP (BindStmt p $2 $1) } + | srcloc 'rec' stmtlist { RecStmt $3 undefined undefined undefined } + +qual :: { RdrNameStmt } + : srcloc infixexp '<-' exp {% checkPattern $1 $2 `thenP` \p -> returnP (BindStmt p $4 $1) } - | srcloc exp { ExprStmt $2 $1 } - | srcloc 'let' declbinds { LetStmt $3 } + | srcloc exp { ExprStmt $2 placeHolderType $1 } + | srcloc 'let' binds { LetStmt $3 } ----------------------------------------------------------------------------- -- Record Field Update/Construction @@ -861,28 +1207,33 @@ fbinds :: { RdrNameHsRecordBinds } | fbind { [$1] } | {- empty -} { [] } -fbind :: { (RdrName, RdrNameHsExpr, Bool) } - : qvar '=' exp { ($1,$3,False) } +fbind :: { (RdrName, RdrNameHsExpr) } + : qvar '=' exp { ($1,$3) } ----------------------------------------------------------------------------- -- Implicit Parameter Bindings -dbinding :: { [(RdrName, RdrNameHsExpr)] } +dbinding :: { [(IPName RdrName, RdrNameHsExpr)] } : '{' dbinds '}' { $2 } | layout_on dbinds close { $2 } -dbinds :: { [(RdrName, RdrNameHsExpr)] } +dbinds :: { [(IPName RdrName, RdrNameHsExpr)] } : dbinds ';' dbind { $3 : $1 } | dbinds ';' { $1 } | dbind { [$1] } - | {- empty -} { [] } +-- | {- empty -} { [] } -dbind :: { (RdrName, RdrNameHsExpr) } +dbind :: { (IPName RdrName, RdrNameHsExpr) } dbind : ipvar '=' exp { ($1, $3) } ----------------------------------------------------------------------------- -- Variables, Constructors and Operators. +identifier :: { RdrName } + : qvar { $1 } + | gcon { $1 } + | qop { $1 } + depreclist :: { [RdrName] } depreclist : deprec_var { [$1] } | deprec_var ',' depreclist { $1 : $3 } @@ -891,19 +1242,15 @@ deprec_var :: { RdrName } deprec_var : var { $1 } | tycon { $1 } -gtycon :: { RdrName } - : qtycon { $1 } - | '(' qtyconop ')' { $2 } - | '(' ')' { unitTyCon_RDR } - | '(' '->' ')' { funTyCon_RDR } - | '[' ']' { listTyCon_RDR } - | '(' commas ')' { tupleTyCon_RDR $2 } - -gcon :: { RdrName } - : '(' ')' { unitCon_RDR } - | '[' ']' { nilCon_RDR } - | '(' commas ')' { tupleCon_RDR $2 } +gcon :: { RdrName } -- Data constructor namespace + : sysdcon { nameRdrName (dataConName $1) } | qcon { $1 } +-- the case of '[:' ':]' is part of the production `parr' + +sysdcon :: { DataCon } -- Wired in data constructors + : '(' ')' { unitDataCon } + | '(' commas ')' { tupleCon Boxed $2 } + | '[' ']' { nilDataCon } var :: { RdrName } : varid { $1 } @@ -917,8 +1264,9 @@ qvar :: { RdrName } -- whether it's a qvar or a var can be postponed until -- *after* we see the close paren. -ipvar :: { RdrName } - : IPVARID { (mkUnqual ipName (tailFS $1)) } +ipvar :: { IPName RdrName } + : IPDUPVARID { Dupable (mkUnqual varName $1) } + | IPSPLITVARID { Linear (mkUnqual varName $1) } qcon :: { RdrName } : qconid { $1 } @@ -945,6 +1293,43 @@ qconop :: { RdrName } | '`' qconid '`' { $2 } ----------------------------------------------------------------------------- +-- Type constructors + +gtycon :: { RdrName } -- A "general" qualified tycon + : oqtycon { $1 } + | '(' ')' { getRdrName unitTyCon } + | '(' commas ')' { getRdrName (tupleTyCon Boxed $2) } + | '(' '->' ')' { nameRdrName funTyConName } + | '[' ']' { nameRdrName listTyConName } + | '[:' ':]' { nameRdrName parrTyConName } + +oqtycon :: { RdrName } -- An "ordinary" qualified tycon + : qtycon { $1 } + | '(' qtyconsym ')' { $2 } + +qtyconop :: { RdrName } -- Qualified or unqualified + : qtyconsym { $1 } + | '`' qtycon '`' { $2 } + +tyconop :: { RdrName } -- Unqualified + : tyconsym { $1 } + | '`' tycon '`' { $2 } + +qtycon :: { RdrName } -- Qualified or unqualified + : QCONID { mkQual tcClsName $1 } + | tycon { $1 } + +tycon :: { RdrName } -- Unqualified + : CONID { mkUnqual tcClsName $1 } + +qtyconsym :: { RdrName } + : QCONSYM { mkQual tcClsName $1 } + | tyconsym { $1 } + +tyconsym :: { RdrName } + : CONSYM { mkUnqual tcClsName $1 } + +----------------------------------------------------------------------------- -- Any operator op :: { RdrName } -- used in infix decls @@ -968,54 +1353,38 @@ qvarid :: { RdrName } varid :: { RdrName } : varid_no_unsafe { $1 } - | 'unsafe' { mkUnqual varName SLIT("unsafe") } + | 'unsafe' { mkUnqual varName FSLIT("unsafe") } + | 'safe' { mkUnqual varName FSLIT("safe") } + | 'threadsafe' { mkUnqual varName FSLIT("threadsafe") } varid_no_unsafe :: { RdrName } : VARID { mkUnqual varName $1 } | special_id { mkUnqual varName $1 } - | 'forall' { mkUnqual varName SLIT("forall") } + | 'forall' { mkUnqual varName FSLIT("forall") } tyvar :: { RdrName } : VARID { mkUnqual tvName $1 } | special_id { mkUnqual tvName $1 } - | 'unsafe' { mkUnqual tvName SLIT("unsafe") } + | 'unsafe' { mkUnqual tvName FSLIT("unsafe") } + | 'safe' { mkUnqual tvName FSLIT("safe") } + | 'threadsafe' { mkUnqual tvName FSLIT("threadsafe") } -- These special_ids are treated as keywords in various places, --- but as ordinary ids elsewhere. A special_id collects all thsee +-- but as ordinary ids elsewhere. 'special_id' collects all these -- except 'unsafe' and 'forall' whose treatment differs depending on context special_id :: { UserFS } special_id - : 'as' { SLIT("as") } - | 'qualified' { SLIT("qualified") } - | 'hiding' { SLIT("hiding") } - | 'export' { SLIT("export") } - | 'label' { SLIT("label") } - | 'dynamic' { SLIT("dynamic") } - | 'stdcall' { SLIT("stdcall") } - | 'ccall' { SLIT("ccall") } - ------------------------------------------------------------------------------ --- ConIds - -qconid :: { RdrName } - : conid { $1 } - | QCONID { mkQual dataName $1 } - -conid :: { RdrName } - : CONID { mkUnqual dataName $1 } - ------------------------------------------------------------------------------ --- ConSyms - -qconsym :: { RdrName } - : consym { $1 } - | QCONSYM { mkQual dataName $1 } - -consym :: { RdrName } - : CONSYM { mkUnqual dataName $1 } + : 'as' { FSLIT("as") } + | 'qualified' { FSLIT("qualified") } + | 'hiding' { FSLIT("hiding") } + | 'export' { FSLIT("export") } + | 'label' { FSLIT("label") } + | 'dynamic' { FSLIT("dynamic") } + | 'stdcall' { FSLIT("stdcall") } + | 'ccall' { FSLIT("ccall") } ----------------------------------------------------------------------------- --- VarSyms +-- Variables qvarsym :: { RdrName } : varsym { $1 } @@ -1030,7 +1399,7 @@ qvarsym1 : QVARSYM { mkQual varName $1 } varsym :: { RdrName } : varsym_no_minus { $1 } - | '-' { mkUnqual varName SLIT("-") } + | '-' { mkUnqual varName FSLIT("-") } varsym_no_minus :: { RdrName } -- varsym not including '-' : VARSYM { mkUnqual varName $1 } @@ -1039,8 +1408,31 @@ varsym_no_minus :: { RdrName } -- varsym not including '-' -- See comments with special_id special_sym :: { UserFS } -special_sym : '!' { SLIT("!") } - | '.' { SLIT(".") } +special_sym : '!' { FSLIT("!") } + | '.' { FSLIT(".") } + | '*' { FSLIT("*") } + +----------------------------------------------------------------------------- +-- Data constructors + +qconid :: { RdrName } -- Qualified or unqualifiedb + : conid { $1 } + | QCONID { mkQual dataName $1 } + +conid :: { RdrName } + : CONID { mkUnqual dataName $1 } + +qconsym :: { RdrName } -- Qualified or unqualified + : consym { $1 } + | QCONSYM { mkQual dataName $1 } + +consym :: { RdrName } + : CONSYM { mkUnqual dataName $1 } + + -- ':' means only list cons + | ':' { nameRdrName consDataConName } + -- NB: SrcName because we are reading source + ----------------------------------------------------------------------------- -- Literals @@ -1053,7 +1445,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 } @@ -1072,23 +1464,11 @@ layout_on_for_do :: { () } : {% layoutOn False } modid :: { ModuleName } : CONID { mkModuleNameFS $1 } - -tycon :: { RdrName } - : CONID { mkUnqual tcClsName $1 } - -tyconop :: { RdrName } - : CONSYM { mkUnqual tcClsName $1 } - -qtycon :: { RdrName } - : tycon { $1 } - | QCONID { mkQual tcClsName $1 } - -qtyconop :: { RdrName } - : tyconop { $1 } - | QCONSYM { mkQual tcClsName $1 } - -qtycls :: { RdrName } - : qtycon { $1 } + | QCONID { mkModuleNameFS + (mkFastString + (unpackFS (fst $1) ++ + '.':unpackFS (snd $1))) + } commas :: { Int } : commas ',' { $1 + 1 }