import FastString
import Maybes ( orElse )
+import Monad ( when )
import Outputable
import GLAEXTS
}
QCONSYM { L _ (ITqconsym _) }
IPDUPVARID { L _ (ITdupipvarid _) } -- GHC extension
- IPSPLITVARID { L _ (ITsplitipvarid _) } -- GHC extension
CHAR { L _ (ITchar _) }
STRING { L _ (ITstring _) }
| 'module' modid { LL (IEModuleContents (unLoc $2)) }
qcnames :: { [RdrName] }
- : qcnames ',' qcname { unLoc $3 : $1 }
- | qcname { [unLoc $1] }
+ : qcnames ',' qcname_ext { unLoc $3 : $1 }
+ | qcname_ext { [unLoc $1] }
+qcname_ext :: { Located RdrName } -- Variable or data constructor
+ -- or tagged type constructor
+ : qcname { $1 }
+ | 'type' qcon { sL (comb2 $1 $2)
+ (setRdrNameSpace (unLoc $2)
+ tcClsName) }
+
+-- Cannot pull into qcname_ext, as qcname is also used in expression.
qcname :: { Located RdrName } -- Variable or data constructor
- : qvar { $1 }
- | qcon { $1 }
+ : qvar { $1 }
+ | qcon { $1 }
-----------------------------------------------------------------------------
-- Import Declarations
(mkClassDecl (ctxt, tc, tvs)
(unLoc $3) sigs binds ats) } }
--- Type declarations
+-- Type declarations (toplevel)
--
ty_decl :: { LTyClDecl RdrName }
-- ordinary type synonyms
} }
-- type family declarations
- | 'type' 'family' opt_iso type '::' kind
+ | 'type' 'family' type opt_kind_sig
-- Note the use of type for the head; this allows
-- infix type constructors to be declared
--
- {% do { (tc, tvs, _) <- checkSynHdr $4 False
- ; return (L (comb3 $1 $4 $6)
- (TyFunction tc tvs $3 (unLoc $6)))
+ {% do { (tc, tvs, _) <- checkSynHdr $3 False
+ ; let kind = case unLoc $4 of
+ Nothing -> liftedTypeKind
+ Just ki -> ki
+ ; return (L (comb3 $1 $3 $4)
+ (TyFunction tc tvs False kind))
} }
-- type instance declarations
(TySynonym tc tvs (Just typats) $5))
} }
- -- ordinary data type or newtype declaration
+ -- ordinary data type or newtype declaration
| data_or_newtype tycl_hdr constrs deriving
{% do { let {(ctxt, tc, tvs, tparms) = unLoc $2}
; checkTyVars tparms -- no type pattern
(mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing)
Nothing (reverse (unLoc $3)) (unLoc $4)) } }
- -- ordinary GADT declaration
+ -- ordinary GADT declaration
| data_or_newtype tycl_hdr opt_kind_sig
'where' gadt_constrlist
deriving
; checkTyVars tparms -- can have type pats
; return $
L (comb4 $1 $2 $4 $5)
- (mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing) $3
- (reverse (unLoc $5)) (unLoc $6)) } }
+ (mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing)
+ (unLoc $3) (reverse (unLoc $5)) (unLoc $6)) } }
- -- data/newtype family
- | data_or_newtype 'family' tycl_hdr '::' kind
+ -- data/newtype family
+ | data_or_newtype 'family' tycl_hdr opt_kind_sig
{% do { let {(ctxt, tc, tvs, tparms) = unLoc $3}
; checkTyVars tparms -- no type pattern
+ ; let kind = case unLoc $4 of
+ Nothing -> liftedTypeKind
+ Just ki -> ki
; return $
- L (comb3 $1 $2 $5)
+ L (comb3 $1 $2 $4)
(mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing)
- (Just (unLoc $5)) [] Nothing) } }
+ (Just kind) [] Nothing) } }
- -- data/newtype instance declaration
+ -- data/newtype instance declaration
| data_or_newtype 'instance' tycl_hdr constrs deriving
{% do { let {(ctxt, tc, tvs, tparms) = unLoc $3}
-- can have type pats
(mkTyData (unLoc $1) (ctxt, tc, tvs, Just tparms)
Nothing (reverse (unLoc $4)) (unLoc $5)) } }
- -- GADT instance declaration
+ -- GADT instance declaration
| data_or_newtype 'instance' tycl_hdr opt_kind_sig
'where' gadt_constrlist
deriving
; return $
L (comb4 $1 $3 $6 $7)
(mkTyData (unLoc $1) (ctxt, tc, tvs, Just tparms)
- $4 (reverse (unLoc $6)) (unLoc $7)) } }
+ (unLoc $4) (reverse (unLoc $6)) (unLoc $7)) } }
+
+-- Associate type declarations
+--
+at_decl :: { LTyClDecl RdrName }
+ -- type family declarations
+ : 'type' type opt_kind_sig
+ -- Note the use of type for the head; this allows
+ -- infix type constructors to be declared
+ --
+ {% do { (tc, tvs, _) <- checkSynHdr $2 False
+ ; let kind = case unLoc $3 of
+ Nothing -> liftedTypeKind
+ Just ki -> ki
+ ; return (L (comb3 $1 $2 $3)
+ (TyFunction tc tvs False kind))
+ } }
+
+ -- type instance declarations
+ | 'type' type '=' ctype
+ -- Note the use of type for the head; this allows
+ -- infix type constructors and type patterns
+ --
+ {% do { (tc, tvs, typats) <- checkSynHdr $2 True
+ ; return (L (comb2 $1 $4)
+ (TySynonym tc tvs (Just typats) $4))
+ } }
+
+ -- data/newtype family
+ | data_or_newtype tycl_hdr '::' kind
+ {% do { let {(ctxt, tc, tvs, tparms) = unLoc $2}
+ ; checkTyVars tparms -- no type pattern
+ ; return $
+ L (comb3 $1 $2 $4)
+ (mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing)
+ (Just (unLoc $4)) [] Nothing) } }
+
+ -- data/newtype instance declaration
+ | data_or_newtype tycl_hdr constrs deriving
+ {% do { let {(ctxt, tc, tvs, tparms) = unLoc $2}
+ -- can have type pats
+ ; return $
+ L (comb4 $1 $2 $3 $4)
+ -- We need the location on tycl_hdr in case
+ -- constrs and deriving are both empty
+ (mkTyData (unLoc $1) (ctxt, tc, tvs, Just tparms)
+ Nothing (reverse (unLoc $3)) (unLoc $4)) } }
+
+ -- GADT instance declaration
+ | data_or_newtype tycl_hdr opt_kind_sig
+ 'where' gadt_constrlist
+ deriving
+ {% do { let {(ctxt, tc, tvs, tparms) = unLoc $2}
+ -- can have type pats
+ ; return $
+ L (comb4 $1 $2 $5 $6)
+ (mkTyData (unLoc $1) (ctxt, tc, tvs, Just tparms)
+ (unLoc $3) (reverse (unLoc $5)) (unLoc $6)) } }
opt_iso :: { Bool }
: { False }
: 'data' { L1 DataType }
| 'newtype' { L1 NewType }
-opt_kind_sig :: { Maybe Kind }
- : { Nothing }
- | '::' kind { Just (unLoc $2) }
+opt_kind_sig :: { Located (Maybe Kind) }
+ : { noLoc Nothing }
+ | '::' kind { LL (Just (unLoc $2)) }
-- tycl_hdr parses the header of a class or data type decl,
-- which takes the form
-- Type declaration or value declaration
--
tydecl :: { Located (OrdList (LHsDecl RdrName)) }
-tydecl : ty_decl { LL (unitOL (L1 (TyClD (unLoc $1)))) }
+tydecl : at_decl { LL (unitOL (L1 (TyClD (unLoc $1)))) }
| decl { $1 }
tydecls :: { Located (OrdList (LHsDecl RdrName)) } -- Reversed
dbind : ipvar '=' exp { LL (IPBind (unLoc $1) $3) }
ipvar :: { Located (IPName RdrName) }
- : IPDUPVARID { L1 (Dupable (mkUnqual varName (getIPDUPVARID $1))) }
- | IPSPLITVARID { L1 (Linear (mkUnqual varName (getIPSPLITVARID $1))) }
+ : IPDUPVARID { L1 (IPName (mkUnqual varName (getIPDUPVARID $1))) }
-----------------------------------------------------------------------------
-- Deprecations
getQVARSYM (L _ (ITqvarsym x)) = x
getQCONSYM (L _ (ITqconsym x)) = x
getIPDUPVARID (L _ (ITdupipvarid x)) = x
-getIPSPLITVARID (L _ (ITsplitipvarid x)) = x
getCHAR (L _ (ITchar x)) = x
getSTRING (L _ (ITstring x)) = x
getINTEGER (L _ (ITinteger x)) = x
projects / ghc-hetmet.git / blobdiff