{
#include "HsVersions.h"
-
module ParseIface ( parseIface ) where
IMP_Ubiq(){-uitous-}
-import ParseUtils
+import CmdLineOpts ( opt_IgnoreIfacePragmas )
import HsSyn -- quite a bit of stuff
import RdrHsSyn -- oodles of synonyms
-import HsPragmas ( noGenPragmas )
+import HsDecls ( HsIdInfo(..) )
+import HsTypes ( mkHsForAllTy )
+import HsCore
+import Literal
+import HsPragmas ( noGenPragmas, noDataPragmas, noClassPragmas, noClassOpPragmas, noInstancePragmas )
+import IdInfo ( exactArity, mkStrictnessInfo, mkBottomStrictnessInfo,
+ ArgUsageInfo, FBTypeInfo
+ )
+import Kind ( Kind, mkArrowKind, mkTypeKind )
+import Lex
+import RnMonad ( SYN_IE(ImportVersion), SYN_IE(LocalVersion), ParsedIface(..),
+ SYN_IE(RdrNamePragma), SYN_IE(ExportItem)
+ )
import Bag ( emptyBag, unitBag, snocBag )
-import FiniteMap ( emptyFM, unitFM, addToFM, plusFM, bagToFM )
-import Name ( ExportFlag(..), mkTupNameStr, preludeQual,
- RdrName(..){-instance Outputable:ToDo:rm-}
- )
-import Outputable -- ToDo:rm
-import PprStyle ( PprStyle(..) ) -- ToDo: rm debugging
+import FiniteMap ( emptyFM, unitFM, addToFM, plusFM, bagToFM, FiniteMap )
+import Name ( OccName(..), isTCOcc, Provenance )
import SrcLoc ( mkIfaceSrcLoc )
-import Util ( panic, pprPanic{-ToDo:rm-} )
+import Util ( panic{-, pprPanic ToDo:rm-} )
+import ParseType ( parseType )
+import ParseUnfolding ( parseUnfolding )
+import Maybes
-----------------------------------------------------------------
-parseIface = parseIToks . lexIface
+parseIface ls = parseIToks (lexIface ls)
-----------------------------------------------------------------
}
FIXITIES_PART { ITfixities }
DECLARATIONS_PART { ITdeclarations }
PRAGMAS_PART { ITpragmas }
- BANG { ITbang }
- CBRACK { ITcbrack }
- CCURLY { ITccurly }
- DCCURLY { ITdccurly }
+ DATA { ITdata }
+ TYPE { ITtype }
+ NEWTYPE { ITnewtype }
+ DERIVING { ITderiving }
CLASS { ITclass }
+ WHERE { ITwhere }
+ INSTANCE { ITinstance }
+ INFIXL { ITinfixl }
+ INFIXR { ITinfixr }
+ INFIX { ITinfix }
+ FORALL { ITforall }
+ BANG { ITbang }
+ VBAR { ITvbar }
+ DCOLON { ITdcolon }
COMMA { ITcomma }
- CPAREN { ITcparen }
DARROW { ITdarrow }
- DATA { ITdata }
- DCOLON { ITdcolon }
DOTDOT { ITdotdot }
EQUAL { ITequal }
- INFIX { ITinfix }
- INFIXL { ITinfixl }
- INFIXR { ITinfixr }
- INSTANCE { ITinstance }
- NEWTYPE { ITnewtype }
- OBRACK { ITobrack }
OCURLY { ITocurly }
- DOCURLY { ITdocurly }
+ OBRACK { ITobrack }
OPAREN { IToparen }
RARROW { ITrarrow }
+ CCURLY { ITccurly }
+ CBRACK { ITcbrack }
+ CPAREN { ITcparen }
SEMI { ITsemi }
- TYPE { ITtype }
- VBAR { ITvbar }
- WHERE { ITwhere }
- INTEGER { ITinteger $$ }
+
VARID { ITvarid $$ }
CONID { ITconid $$ }
VARSYM { ITvarsym $$ }
QCONID { ITqconid $$ }
QVARSYM { ITqvarsym $$ }
QCONSYM { ITqconsym $$ }
+
+ IDINFO_PART { ITidinfo $$ }
+ TYPE_PART { ITtysig $$ }
+ ARITY_PART { ITarity }
+ STRICT_PART { ITstrict }
+ UNFOLD_PART { ITunfold }
+ DEMAND { ITdemand $$ }
+ BOTTOM { ITbottom }
+ LAM { ITlam }
+ BIGLAM { ITbiglam }
+ CASE { ITcase }
+ PRIM_CASE { ITprim_case }
+ LET { ITlet }
+ LETREC { ITletrec }
+ IN { ITin }
+ OF { ITof }
+ COERCE_IN { ITcoerce_in }
+ COERCE_OUT { ITcoerce_out }
+ ATSIGN { ITatsign }
+ CCALL { ITccall $$ }
+ SCC { ITscc $$ }
+
+ CHAR { ITchar $$ }
+ STRING { ITstring $$ }
+ INTEGER { ITinteger $$ }
+ DOUBLE { ITdouble $$ }
+
+ INTEGER_LIT { ITinteger_lit }
+ FLOAT_LIT { ITfloat_lit }
+ RATIONAL_LIT { ITrational_lit }
+ ADDR_LIT { ITaddr_lit }
+ LIT_LIT { ITlit_lit }
+ STRING_LIT { ITstring_lit }
+
+ UNKNOWN { ITunknown $$ }
%%
iface :: { ParsedIface }
iface : INTERFACE CONID INTEGER
- usages_part versions_part
- exports_part inst_modules_part
- fixities_part decls_part instances_part pragmas_part
- { case $9 of { (tm, vm) ->
- ParsedIface $2 (panic "merge modules") (fromInteger $3) Nothing{-src version-}
- $4 -- usages
- $5 -- local versions
- $6 -- exports map
- $7 -- instance modules
- $8 -- fixities map
- tm -- decls maps
- vm
- $10 -- local instances
- $11 -- pragmas map
+ inst_modules_part
+ usages_part
+ exports_part fixities_part
+ instances_part
+ decls_part
+ { ParsedIface
+ $2 -- Module name
+ (fromInteger $3) -- Module version
+ $5 -- Usages
+ $6 -- Exports
+ $4 -- Instance modules
+ $7 -- Fixities
+ $9 -- Decls
+ $8 -- Local instances
}
+
+
+usages_part :: { [ImportVersion OccName] }
+usages_part : USAGES_PART module_stuff_pairs { $2 }
+ | { [] }
+
+module_stuff_pairs :: { [ImportVersion OccName] }
+module_stuff_pairs : { [] }
+ | module_stuff_pair module_stuff_pairs { $1 : $2 }
+
+module_stuff_pair :: { ImportVersion OccName }
+module_stuff_pair : mod_name INTEGER DCOLON name_version_pairs SEMI
+ { ($1, fromInteger $2, $4) }
+
+versions_part :: { [LocalVersion OccName] }
+versions_part : VERSIONS_PART name_version_pairs { $2 }
+ | { [] }
+
+name_version_pairs :: { [LocalVersion OccName] }
+name_version_pairs : { [] }
+ | name_version_pair name_version_pairs { $1 : $2 }
+
+name_version_pair :: { LocalVersion OccName }
+name_version_pair : entity_occ INTEGER { ($1, fromInteger $2)
--------------------------------------------------------------------------
- }
-
-usages_part :: { UsagesMap }
-usages_part : USAGES_PART module_stuff_pairs { bagToFM $2 }
- | { emptyFM }
-
-versions_part :: { VersionsMap }
-versions_part : VERSIONS_PART name_version_pairs { bagToFM $2 }
- | { emptyFM }
-
-module_stuff_pairs :: { Bag (Module, (Version, FiniteMap FAST_STRING Version)) }
-module_stuff_pairs : module_stuff_pair
- { unitBag $1 }
- | module_stuff_pairs module_stuff_pair
- { $1 `snocBag` $2 }
-
-module_stuff_pair :: { (Module, (Version, FiniteMap FAST_STRING Version)) }
-module_stuff_pair : CONID INTEGER DCOLON name_version_pairs SEMI
- { ($1, (fromInteger $2, bagToFM $4)) }
-
-name_version_pairs :: { Bag (FAST_STRING, Int) }
-name_version_pairs : name_version_pair
- { unitBag $1 }
- | name_version_pairs name_version_pair
- { $1 `snocBag` $2 }
-
-name_version_pair :: { (FAST_STRING, Int) }
-name_version_pair : name INTEGER
- { ($1, fromInteger $2)
---------------------------------------------------------------------------
- }
+ }
+
+exports_part :: { [ExportItem] }
+exports_part : EXPORTS_PART export_items { $2 }
+ | { [] }
-exports_part :: { ExportsMap }
-exports_part : EXPORTS_PART export_items { bagToFM $2 }
- | { emptyFM }
+export_items :: { [ExportItem] }
+export_items : { [] }
+ | mod_name entities SEMI export_items { ($1,$2) : $4 }
-export_items :: { Bag (FAST_STRING, (OrigName, ExportFlag)) }
-export_items : export_item { unitBag $1 }
- | export_items export_item { $1 `snocBag` $2 }
+entities :: { [(OccName, [OccName])] }
+entities : { [] }
+ | entity entities { $1 : $2 }
-export_item :: { (FAST_STRING, (OrigName, ExportFlag)) }
-export_item : CONID name maybe_dotdot { ($2, (OrigName $1 $2, $3)) }
+entity :: { (OccName, [OccName]) }
+entity : entity_occ { ($1, if isTCOcc $1
+ then [$1] {- AvailTC -}
+ else []) {- Avail -} }
+ | entity_occ stuff_inside { ($1, ($1 : $2)) {- TyCls exported too -} }
+ | entity_occ BANG stuff_inside { ($1, $3) {- TyCls not exported -} }
-maybe_dotdot :: { ExportFlag }
-maybe_dotdot : DOTDOT { ExportAll }
- | { ExportAbs
+stuff_inside :: { [OccName] }
+stuff_inside : OPAREN val_occs1 CPAREN { $2
--------------------------------------------------------------------------
- }
+ }
-inst_modules_part :: { Bag Module }
-inst_modules_part : INSTANCE_MODULES_PART mod_list { $2 }
- | { emptyBag }
+inst_modules_part :: { [Module] }
+inst_modules_part : { [] }
+ | INSTANCE_MODULES_PART mod_list { $2 }
-mod_list :: { Bag Module }
-mod_list : CONID { unitBag $1 }
- | mod_list CONID { $1 `snocBag` $2
+mod_list :: { [Module] }
+mod_list : { [] }
+ | mod_name mod_list { $1 : $2
--------------------------------------------------------------------------
- }
+ }
-fixities_part :: { FixitiesMap }
-fixities_part : FIXITIES_PART fixes { $2 }
- | { emptyFM }
+fixities_part :: { [(OccName,Fixity)] }
+fixities_part : { [] }
+ | FIXITIES_PART fixes { $2 }
-fixes :: { FixitiesMap }
-fixes : fix { case $1 of (k,v) -> unitFM k v }
- | fixes fix { case $2 of (k,v) -> addToFM $1 k v }
+fixes :: { [(OccName,Fixity)] }
+fixes : { [] }
+ | fix fixes { $1 : $2 }
-fix :: { (FAST_STRING, RdrNameFixityDecl) }
-fix : INFIXL INTEGER qname SEMI { (de_qual $3, InfixL $3 (fromInteger $2)) }
- | INFIXR INTEGER qname SEMI { (de_qual $3, InfixR $3 (fromInteger $2)) }
- | INFIX INTEGER qname SEMI { (de_qual $3, InfixN $3 (fromInteger $2))
+fix :: { (OccName, Fixity) }
+fix : INFIXL INTEGER val_occ SEMI { ($3, Fixity (fromInteger $2) InfixL) }
+ | INFIXR INTEGER val_occ SEMI { ($3, Fixity (fromInteger $2) InfixR) }
+ | INFIX INTEGER val_occ SEMI { ($3, Fixity (fromInteger $2) InfixN)
--------------------------------------------------------------------------
- }
-
-decls_part :: { (LocalTyDefsMap, LocalValDefsMap) }
-decls_part : DECLARATIONS_PART topdecls { $2 }
- | { (emptyFM, emptyFM) }
-
-topdecls :: { (LocalTyDefsMap, LocalValDefsMap) }
-topdecls : topdecl { $1 }
- | topdecls topdecl { case $1 of { (ts1, vs1) ->
- case $2 of { (ts2, vs2) ->
- (plusFM ts1 ts2, plusFM vs1 vs2)}}
- }
-
-topdecl :: { (LocalTyDefsMap, LocalValDefsMap) }
-topdecl : typed SEMI { ($1, emptyFM) }
- | datad SEMI { $1 }
- | newtd SEMI { $1 }
- | classd SEMI { $1 }
- | decl { case $1 of { (n, Sig qn ty _ loc) ->
- (emptyFM, unitFM n (ValSig qn loc ty)) }
- }
-
-typed :: { LocalTyDefsMap }
-typed : TYPE simple EQUAL type { mk_type $2 $4 }
-
-datad :: { (LocalTyDefsMap, LocalValDefsMap) }
-datad : DATA simple EQUAL constrs { mk_data [] $2 $4 }
- | DATA context DARROW simple EQUAL constrs { mk_data $2 $4 $6 }
-
-newtd :: { (LocalTyDefsMap, LocalValDefsMap) }
-newtd : NEWTYPE simple EQUAL constr1 { mk_new [] $2 $4 }
- | NEWTYPE context DARROW simple EQUAL constr1 { mk_new $2 $4 $6 }
-
-classd :: { (LocalTyDefsMap, LocalValDefsMap) }
-classd : CLASS class cbody { mk_class [] $2 $3 }
- | CLASS context DARROW class cbody { mk_class $2 $4 $5 }
-
-cbody :: { [(FAST_STRING, RdrNameSig)] }
-cbody : WHERE OCURLY decls CCURLY { $3 }
- | { [] }
-
-decls :: { [(FAST_STRING, RdrNameSig)] }
-decls : decl { [$1] }
- | decls decl { $1 ++ [$2] }
-
-decl :: { (FAST_STRING, RdrNameSig) }
-decl : var DCOLON ctype SEMI { (de_qual $1, Sig $1 $3 noGenPragmas mkIfaceSrcLoc) }
+ }
+
+decls_part :: { [(Version, RdrNameHsDecl)] }
+decls_part : { [] }
+ | DECLARATIONS_PART topdecls { $2 }
+
+topdecls :: { [(Version, RdrNameHsDecl)] }
+topdecls : { [] }
+ | version topdecl topdecls { ($1,$2) : $3 }
+
+version :: { Version }
+version : INTEGER { fromInteger $1 }
+
+topdecl :: { RdrNameHsDecl }
+topdecl : TYPE tc_name tv_bndrs EQUAL type SEMI
+ { TyD (TySynonym $2 $3 $5 mkIfaceSrcLoc) }
+ | DATA decl_context tc_name tv_bndrs constrs deriving SEMI
+ { TyD (TyData $2 $3 $4 $5 $6 noDataPragmas mkIfaceSrcLoc) }
+ | NEWTYPE decl_context tc_name tv_bndrs EQUAL constr1 deriving SEMI
+ { TyD (TyNew $2 $3 $4 $6 $7 noDataPragmas mkIfaceSrcLoc) }
+ | CLASS decl_context tc_name tv_bndr csigs SEMI
+ { ClD (ClassDecl $2 $3 $4 $5 EmptyMonoBinds noClassPragmas mkIfaceSrcLoc) }
+ | var_name TYPE_PART id_info
+ {
+ let
+ (Succeeded tp) = parseType $2
+ in
+ SigD (IfaceSig $1 tp $3 mkIfaceSrcLoc) }
+
+id_info :: { [HsIdInfo RdrName] }
+id_info : { [] }
+ | IDINFO_PART { let { (Succeeded id_info) = parseUnfolding $1 } in id_info}
+
+decl_context :: { RdrNameContext }
+decl_context : { [] }
+ | OCURLY context_list1 CCURLY DARROW { $2 }
+
+
+csigs :: { [RdrNameSig] }
+csigs : { [] }
+ | WHERE OCURLY csigs1 CCURLY { $3 }
+
+csigs1 :: { [RdrNameSig] }
+csigs1 : csig { [$1] }
+ | csig SEMI csigs1 { $1 : $3 }
+
+csig :: { RdrNameSig }
+csig : var_name DCOLON type { ClassOpSig $1 $1 $3 mkIfaceSrcLoc
+----------------------------------------------------------------
+ }
+
+constrs :: { [RdrNameConDecl] }
+ : { [] }
+ | EQUAL constrs1 { $2 }
+
+constrs1 :: { [RdrNameConDecl] }
+constrs1 : constr { [$1] }
+ | constr VBAR constrs1 { $1 : $3 }
+
+constr :: { RdrNameConDecl }
+constr : data_name batypes { ConDecl $1 $2 mkIfaceSrcLoc }
+ | data_name OCURLY fields1 CCURLY { RecConDecl $1 $3 mkIfaceSrcLoc }
+
+constr1 :: { RdrNameConDecl {- For a newtype -} }
+constr1 : data_name atype { NewConDecl $1 $2 mkIfaceSrcLoc }
+
+deriving :: { Maybe [RdrName] }
+ : { Nothing }
+ | DERIVING OPAREN qtc_names1 CPAREN { Just $3 }
+
+batypes :: { [RdrNameBangType] }
+batypes : { [] }
+ | batype batypes { $1 : $2 }
+
+batype :: { RdrNameBangType }
+batype : atype { Unbanged $1 }
+ | BANG atype { Banged $2 }
+
+fields1 :: { [([RdrName], RdrNameBangType)] }
+fields1 : field { [$1] }
+ | field COMMA fields1 { $1 : $3 }
+
+field :: { ([RdrName], RdrNameBangType) }
+field : var_names1 DCOLON type { ($1, Unbanged $3) }
+ | var_names1 DCOLON BANG type { ($1, Banged $4)
+--------------------------------------------------------------------------
+ }
+
+forall :: { [HsTyVar RdrName] }
+forall : OBRACK tv_bndrs CBRACK { $2 }
context :: { RdrNameContext }
-context : DOCURLY context_list DCCURLY { reverse $2 }
-
-context_list :: { RdrNameContext{-reversed-} }
-context_list : class { [$1] }
- | context_list COMMA class { $3 : $1 }
-
-class :: { (RdrName, RdrName) }
-class : gtycon VARID { ($1, Unqual $2) }
-
-ctype :: { RdrNamePolyType }
-ctype : context DARROW type { HsPreForAllTy $1 $3 }
- | type { HsPreForAllTy [] $1 }
-
-type :: { RdrNameMonoType }
-type : btype { $1 }
- | btype RARROW type { MonoFunTy $1 $3 }
-
-types :: { [RdrNameMonoType] }
-types : type { [$1] }
- | types COMMA type { $1 ++ [$3] }
-
-btype :: { RdrNameMonoType }
-btype : gtyconapp { case $1 of (tc, tys) -> MonoTyApp tc tys }
- | ntyconapp { case $1 of { (ty1, tys) ->
- if null tys
- then ty1
- else
- case ty1 of {
- MonoTyVar tv -> MonoTyApp tv tys;
- MonoTyApp tc ts -> MonoTyApp tc (ts++tys);
- MonoFunTy t1 t2 -> MonoTyApp (preludeQual SLIT("->")) (t1:t2:tys);
- MonoListTy ty -> MonoTyApp (preludeQual SLIT("[]")) (ty:tys);
- MonoTupleTy ts -> MonoTyApp (preludeQual (mkTupNameStr (length ts)))
- (ts++tys);
- _ -> pprPanic "test:" (ppr PprDebug $1)
- }}
- }
+context : { [] }
+ | OCURLY context_list1 CCURLY { $2 }
-ntyconapp :: { (RdrNameMonoType, [RdrNameMonoType]) }
-ntyconapp : ntycon { ($1, []) }
- | ntyconapp atype { case $1 of (t1,tys) -> (t1, tys ++ [$2]) }
-
-gtyconapp :: { (RdrName, [RdrNameMonoType]) }
-gtyconapp : gtycon { ($1, []) }
- | gtyconapp atype { case $1 of (tc,tys) -> (tc, tys ++ [$2]) }
-
-atype :: { RdrNameMonoType }
-atype : gtycon { MonoTyApp $1 [] }
- | ntycon { $1 }
-
-atypes :: { [RdrNameMonoType] }
-atypes : atype { [$1] }
- | atypes atype { $1 ++ [$2] }
-
-ntycon :: { RdrNameMonoType }
-ntycon : VARID { MonoTyVar (Unqual $1) }
- | OPAREN type COMMA types CPAREN { MonoTupleTy ($2 : $4) }
- | OBRACK type CBRACK { MonoListTy $2 }
- | OPAREN type CPAREN { $2 }
-
-gtycon :: { RdrName }
-gtycon : QCONID { $1 }
- | OPAREN RARROW CPAREN { preludeQual SLIT("->") }
- | OBRACK CBRACK { preludeQual SLIT("[]") }
- | OPAREN CPAREN { preludeQual SLIT("()") }
- | OPAREN commas CPAREN { preludeQual (mkTupNameStr $2) }
-
-commas :: { Int }
-commas : COMMA { 2{-1 comma => arity 2-} }
- | commas COMMA { $1 + 1 }
-
-simple :: { (RdrName, [FAST_STRING]) }
-simple : gtycon { ($1, []) }
- | gtyconvars { case $1 of (tc,tvs) -> (tc, reverse tvs) }
-
-gtyconvars :: { (RdrName, [FAST_STRING] {-reversed-}) }
-gtyconvars : gtycon VARID { ($1, [$2]) }
- | gtyconvars VARID { case $1 of (tc,tvs) -> (tc, $2 : tvs) }
-
-constrs :: { [(RdrName, RdrNameConDecl)] }
-constrs : constr { [$1] }
- | constrs VBAR constr { $1 ++ [$3] }
-
-constr :: { (RdrName, RdrNameConDecl) }
-constr : btyconapp
- { case $1 of (con, tys) -> (con, ConDecl con tys mkIfaceSrcLoc) }
- | QCONSYM { ($1, ConDecl $1 [] mkIfaceSrcLoc) }
- | QCONSYM batypes { ($1, ConDecl $1 $2 mkIfaceSrcLoc) }
- | gtycon OCURLY fields CCURLY
- { ($1, RecConDecl $1 $3 mkIfaceSrcLoc) }
-
-btyconapp :: { (RdrName, [RdrNameBangType]) }
-btyconapp : gtycon { ($1, []) }
- | btyconapp batype { case $1 of (tc,tys) -> (tc, tys ++ [$2]) }
-
-bbtype :: { RdrNameBangType }
-bbtype : btype { Unbanged (HsPreForAllTy [] $1) }
- | BANG atype { Banged (HsPreForAllTy [] $2) }
+context_list1 :: { RdrNameContext }
+context_list1 : class { [$1] }
+ | class COMMA context_list1 { $1 : $3 }
-batype :: { RdrNameBangType }
-batype : atype { Unbanged (HsPreForAllTy [] $1) }
- | BANG atype { Banged (HsPreForAllTy [] $2) }
+class :: { (RdrName, RdrNameHsType) }
+class : qtc_name atype { ($1, $2) }
-batypes :: { [RdrNameBangType] }
-batypes : batype { [$1] }
- | batypes batype { $1 ++ [$2] }
+type :: { RdrNameHsType }
+type : FORALL forall context DARROW type { mkHsForAllTy $2 $3 $5 }
+ | tautype { $1 }
-fields :: { [([RdrName], RdrNameBangType)] }
-fields : field { [$1] }
- | fields COMMA field { $1 ++ [$3] }
+tautype :: { RdrNameHsType }
+tautype : btype { $1 }
+ | btype RARROW tautype { MonoFunTy $1 $3 }
-field :: { ([RdrName], RdrNameBangType) }
-field : var DCOLON type { ([$1], Unbanged (HsPreForAllTy [] $3)) }
- | var DCOLON BANG atype { ([$1], Banged (HsPreForAllTy [] $4)) }
-
-constr1 :: { (RdrName, RdrNameMonoType) }
-constr1 : gtycon atype { ($1, $2) }
-
-var :: { RdrName }
-var : QVARID { $1 }
- | QVARSYM { $1 }
-
-qname :: { RdrName }
-qname : QVARID { $1 }
- | QCONID { $1 }
- | QVARSYM { $1 }
- | QCONSYM { $1 }
-
-name :: { FAST_STRING }
-name : VARID { $1 }
- | CONID { $1 }
- | VARSYM { $1 }
- | BANG { SLIT("!"){-sigh, double-sigh-} }
- | CONSYM { $1 }
-
-instances_part :: { Bag RdrIfaceInst }
-instances_part : INSTANCES_PART instdecls { $2 }
- | { emptyBag }
-
-instdecls :: { Bag RdrIfaceInst }
-instdecls : instd { unitBag $1 }
- | instdecls instd { $1 `snocBag` $2 }
-
-instd :: { RdrIfaceInst }
-instd : INSTANCE context DARROW gtycon restrict_inst SEMI { mk_inst $2 $4 $5 }
- | INSTANCE gtycon general_inst SEMI { mk_inst [] $2 $3 }
-
-restrict_inst :: { RdrNameMonoType }
-restrict_inst : gtycon { MonoTyApp $1 [] }
- | OPAREN gtyconvars CPAREN { case $2 of (tc,tvs) -> MonoTyApp tc (map en_mono tvs) }
- | OPAREN VARID COMMA tyvar_list CPAREN { MonoTupleTy (map en_mono ($2:$4)) }
- | OBRACK VARID CBRACK { MonoListTy (en_mono $2) }
- | OPAREN VARID RARROW VARID CPAREN { MonoFunTy (en_mono $2) (en_mono $4) }
-
-general_inst :: { RdrNameMonoType }
-general_inst : gtycon { MonoTyApp $1 [] }
- | OPAREN gtyconapp CPAREN { case $2 of (tc,tys) -> MonoTyApp tc tys }
- | OPAREN type COMMA types CPAREN { MonoTupleTy ($2:$4) }
- | OBRACK type CBRACK { MonoListTy $2 }
- | OPAREN btype RARROW type CPAREN { MonoFunTy $2 $4 }
-
-tyvar_list :: { [FAST_STRING] }
-tyvar_list : VARID { [$1] }
- | tyvar_list COMMA VARID { $1 ++ [$3]
+types2 :: { [RdrNameHsType] {- Two or more -} }
+types2 : type COMMA type { [$1,$3] }
+ | type COMMA types2 { $1 : $3 }
+
+btype :: { RdrNameHsType }
+btype : atype { $1 }
+ | btype atype { MonoTyApp $1 $2 }
+
+atype :: { RdrNameHsType }
+atype : qtc_name { MonoTyVar $1 }
+ | tv_name { MonoTyVar $1 }
+ | OPAREN types2 CPAREN { MonoTupleTy dummyRdrTcName $2 }
+ | OBRACK type CBRACK { MonoListTy dummyRdrTcName $2 }
+ | OCURLY qtc_name atype CCURLY { MonoDictTy $2 $3 }
+ | OPAREN type CPAREN { $2 }
+
+atypes :: { [RdrNameHsType] {- Zero or more -} }
+atypes : { [] }
+ | atype atypes { $1 : $2
+---------------------------------------------------------------------
+ }
+
+mod_name :: { Module }
+ : CONID { $1 }
+
+var_occ :: { OccName }
+var_occ : VARID { VarOcc $1 }
+ | VARSYM { VarOcc $1 }
+ | BANG { VarOcc SLIT("!") {-sigh, double-sigh-} }
+
+tc_occ :: { OccName }
+tc_occ : CONID { TCOcc $1 }
+ | CONSYM { TCOcc $1 }
+ | OPAREN RARROW CPAREN { TCOcc SLIT("->") }
+
+entity_occ :: { OccName }
+entity_occ : var_occ { $1 }
+ | tc_occ { $1 }
+ | RARROW { TCOcc SLIT("->") {- Allow un-paren'd arrow -} }
+
+val_occ :: { OccName }
+val_occ : var_occ { $1 }
+ | CONID { VarOcc $1 }
+ | CONSYM { VarOcc $1 }
+
+val_occs1 :: { [OccName] }
+ : val_occ { [$1] }
+ | val_occ val_occs1 { $1 : $2 }
+
+
+qvar_name :: { RdrName }
+ : QVARID { varQual $1 }
+ | QVARSYM { varQual $1 }
+
+var_name :: { RdrName }
+var_name : var_occ { Unqual $1 }
+
+var_names1 :: { [RdrName] }
+var_names1 : var_name { [$1] }
+ | var_name var_names1 { $1 : $2 }
+
+any_var_name :: {RdrName}
+any_var_name : var_name { $1 }
+ | qvar_name { $1 }
+
+qdata_name :: { RdrName }
+qdata_name : QCONID { varQual $1 }
+ | QCONSYM { varQual $1 }
+
+data_name :: { RdrName }
+data_name : CONID { Unqual (VarOcc $1) }
+ | CONSYM { Unqual (VarOcc $1) }
+
+
+qtc_name :: { RdrName }
+qtc_name : QCONID { tcQual $1 }
+
+qtc_names1 :: { [RdrName] }
+ : qtc_name { [$1] }
+ | qtc_name COMMA qtc_names1 { $1 : $3 }
+
+tc_name :: { RdrName }
+tc_name : tc_occ { Unqual $1 }
+
+tv_name :: { RdrName }
+tv_name : VARID { Unqual (TvOcc $1) }
+
+tv_names :: { [RdrName] }
+ : { [] }
+ | tv_name tv_names { $1 : $2 }
+
+tv_bndr :: { HsTyVar RdrName }
+tv_bndr : tv_name DCOLON akind { IfaceTyVar $1 $3 }
+ | tv_name { UserTyVar $1 }
+
+tv_bndrs :: { [HsTyVar RdrName] }
+ : { [] }
+ | tv_bndr tv_bndrs { $1 : $2 }
+
+kind :: { Kind }
+ : akind { $1 }
+ | akind RARROW kind { mkArrowKind $1 $3 }
+
+akind :: { Kind }
+ : VARSYM { mkTypeKind {- ToDo: check that it's "*" -} }
+ | OPAREN kind CPAREN { $2
--------------------------------------------------------------------------
- }
+ }
-pragmas_part :: { LocalPragmasMap }
-pragmas_part : PRAGMAS_PART
- { emptyFM }
- | { emptyFM }
-{
-}
+
+instances_part :: { [RdrNameInstDecl] }
+instances_part : INSTANCES_PART instdecls { $2 }
+ | { [] }
+
+instdecls :: { [RdrNameInstDecl] }
+instdecls : { [] }
+ | instd instdecls { $1 : $2 }
+
+instd :: { RdrNameInstDecl }
+instd : INSTANCE type EQUAL var_name SEMI
+ { InstDecl $2
+ EmptyMonoBinds {- No bindings -}
+ [] {- No user pragmas -}
+ (Just $4) {- Dfun id -}
+ mkIfaceSrcLoc
+--------------------------------------------------------------------------
+ }