X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FhsSyn%2FConvert.lhs;h=9bae01e84d4e11142aaece2bbe4324fd16796297;hp=5a5bb1b1a9d8b0271ae3bdff53c0f38a7a5886f1;hb=432b9c9322181a3644083e3c19b7e240d90659e7;hpb=92eeda1e1d846a082a60caab1b75593d7cc668ed diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs index 5a5bb1b..9bae01e 100644 --- a/compiler/hsSyn/Convert.lhs +++ b/compiler/hsSyn/Convert.lhs @@ -6,15 +6,8 @@ This module converts Template Haskell syntax into HsSyn \begin{code} -{-# OPTIONS -fno-warn-incomplete-patterns #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings --- for details - module Convert( convertToHsExpr, convertToPat, convertToHsDecls, - convertToHsType, thRdrName ) where + convertToHsType, thRdrNameGuesses ) where import HsSyn as Hs import qualified Class @@ -27,11 +20,12 @@ import OccName import SrcLoc import Type import TysWiredIn -import BasicTypes +import BasicTypes as Hs import ForeignCall import Char import List import Unique +import MonadUtils import ErrUtils import Bag import FastString @@ -51,14 +45,14 @@ convertToHsDecls loc ds = initCvt loc (mapM cvtTop ds) convertToHsExpr :: SrcSpan -> TH.Exp -> Either Message (LHsExpr RdrName) convertToHsExpr loc e = case initCvt loc (cvtl e) of - Left msg -> Left (msg $$ (ptext (sLit "When converting TH expression") + Left msg -> Left (msg $$ (ptext (sLit "When splicing TH expression:") <+> text (show e))) Right res -> Right res convertToPat :: SrcSpan -> TH.Pat -> Either Message (LPat RdrName) convertToPat loc e = case initCvt loc (cvtPat e) of - Left msg -> Left (msg $$ (ptext (sLit "When converting TH pattern") + Left msg -> Left (msg $$ (ptext (sLit "When splicing TH pattern:") <+> text (show e))) Right res -> Right res @@ -107,60 +101,161 @@ wrapL (CvtM m) = CvtM (\loc -> case m loc of ------------------------------------------------------------------- cvtTop :: TH.Dec -> CvtM (LHsDecl RdrName) -cvtTop d@(TH.ValD _ _ _) = do { L loc d' <- cvtBind d; return (L loc $ Hs.ValD d') } -cvtTop d@(TH.FunD _ _) = do { L loc d' <- cvtBind d; return (L loc $ Hs.ValD d') } -cvtTop (TH.SigD nm typ) = do { nm' <- vNameL nm - ; ty' <- cvtType typ - ; returnL $ Hs.SigD (TypeSig nm' ty') } +cvtTop d@(TH.ValD _ _ _) + = do { L loc d' <- cvtBind d + ; return (L loc $ Hs.ValD d') } + +cvtTop d@(TH.FunD _ _) + = do { L loc d' <- cvtBind d + ; return (L loc $ Hs.ValD d') } + +cvtTop (TH.SigD nm typ) + = do { nm' <- vNameL nm + ; ty' <- cvtType typ + ; returnL $ Hs.SigD (TypeSig nm' ty') } cvtTop (TySynD tc tvs rhs) - = do { tc' <- tconNameL tc - ; tvs' <- cvtTvs tvs + = do { (_, tc', tvs') <- cvt_tycl_hdr [] tc tvs ; rhs' <- cvtType rhs ; returnL $ TyClD (TySynonym tc' tvs' Nothing rhs') } cvtTop (DataD ctxt tc tvs constrs derivs) - = do { stuff <- cvt_tycl_hdr ctxt tc tvs + = do { (ctxt', tc', tvs') <- cvt_tycl_hdr ctxt tc tvs ; cons' <- mapM cvtConstr constrs ; derivs' <- cvtDerivs derivs - ; returnL $ TyClD (mkTyData DataType stuff Nothing cons' derivs') } - + ; returnL $ TyClD (TyData { tcdND = DataType, tcdLName = tc', tcdCtxt = ctxt' + , tcdTyVars = tvs', tcdTyPats = Nothing, tcdKindSig = Nothing + , tcdCons = cons', tcdDerivs = derivs' }) } cvtTop (NewtypeD ctxt tc tvs constr derivs) - = do { stuff <- cvt_tycl_hdr ctxt tc tvs + = do { (ctxt', tc', tvs') <- cvt_tycl_hdr ctxt tc tvs ; con' <- cvtConstr constr ; derivs' <- cvtDerivs derivs - ; returnL $ TyClD (mkTyData NewType stuff Nothing [con'] derivs') } + ; returnL $ TyClD (TyData { tcdND = NewType, tcdLName = tc', tcdCtxt = ctxt' + , tcdTyVars = tvs', tcdTyPats = Nothing, tcdKindSig = Nothing + , tcdCons = [con'], tcdDerivs = derivs'}) } cvtTop (ClassD ctxt cl tvs fds decs) - = do { (cxt', tc', tvs', _) <- cvt_tycl_hdr ctxt cl tvs + = do { (cxt', tc', tvs') <- cvt_tycl_hdr ctxt cl tvs ; fds' <- mapM cvt_fundep fds - ; (binds', sigs') <- cvtBindsAndSigs decs - ; returnL $ TyClD $ mkClassDecl (cxt', tc', tvs') fds' sigs' binds' [] [] - -- no ATs or docs in TH ^^ ^^ + ; let (ats, bind_sig_decs) = partition isFamilyD decs + ; (binds', sigs') <- cvtBindsAndSigs bind_sig_decs + ; ats' <- mapM cvtTop ats + ; let ats'' = map unTyClD ats' + ; returnL $ + TyClD $ ClassDecl { tcdCtxt = cxt', tcdLName = tc', tcdTyVars = tvs' + , tcdFDs = fds', tcdSigs = sigs', tcdMeths = binds' + , tcdATs = ats'', tcdDocs = [] } + -- no docs in TH ^^ } - -cvtTop (InstanceD tys ty decs) - = do { (binds', sigs') <- cvtBindsAndSigs decs - ; ctxt' <- cvtContext tys - ; L loc pred' <- cvtPred ty - ; inst_ty' <- returnL $ mkImplicitHsForAllTy ctxt' (L loc (HsPredTy pred')) - ; returnL $ InstD (InstDecl inst_ty' binds' sigs' []) - -- no ATs in TH ^^ + where + isFamilyD (FamilyD _ _ _ _) = True + isFamilyD _ = False + +cvtTop (InstanceD ctxt ty decs) + = do { let (ats, bind_sig_decs) = partition isFamInstD decs + ; (binds', sigs') <- cvtBindsAndSigs bind_sig_decs + ; ats' <- mapM cvtTop ats + ; let ats'' = map unTyClD ats' + ; ctxt' <- cvtContext ctxt + ; L loc pred' <- cvtPredTy ty + ; inst_ty' <- returnL $ + mkImplicitHsForAllTy ctxt' (L loc (HsPredTy pred')) + ; returnL $ InstD (InstDecl inst_ty' binds' sigs' ats'') } - -cvtTop (ForeignD ford) = do { ford' <- cvtForD ford; returnL $ ForD ford' } - -cvt_tycl_hdr :: TH.Cxt -> TH.Name -> [TH.Name] - -> CvtM (LHsContext RdrName - ,Located RdrName - ,[LHsTyVarBndr RdrName] - ,Maybe [LHsType RdrName]) + where + isFamInstD (DataInstD _ _ _ _ _) = True + isFamInstD (NewtypeInstD _ _ _ _ _) = True + isFamInstD (TySynInstD _ _ _) = True + isFamInstD _ = False + +cvtTop (ForeignD ford) + = do { ford' <- cvtForD ford + ; returnL $ ForD ford' + } + +cvtTop (PragmaD prag) + = do { prag' <- cvtPragmaD prag + ; returnL $ Hs.SigD prag' + } + +cvtTop (FamilyD flav tc tvs kind) + = do { (_, tc', tvs') <- cvt_tycl_hdr [] tc tvs + ; let kind' = fmap cvtKind kind + ; returnL $ TyClD (TyFamily (cvtFamFlavour flav) tc' tvs' kind') + } + where + cvtFamFlavour TypeFam = TypeFamily + cvtFamFlavour DataFam = DataFamily + +cvtTop (DataInstD ctxt tc tys constrs derivs) + = do { (ctxt', tc', tvs', typats') <- cvt_tyinst_hdr ctxt tc tys + ; cons' <- mapM cvtConstr constrs + ; derivs' <- cvtDerivs derivs + ; returnL $ TyClD (TyData { tcdND = DataType, tcdLName = tc', tcdCtxt = ctxt' + , tcdTyVars = tvs', tcdTyPats = typats', tcdKindSig = Nothing + , tcdCons = cons', tcdDerivs = derivs' }) + } + +cvtTop (NewtypeInstD ctxt tc tys constr derivs) + = do { (ctxt', tc', tvs', typats') <- cvt_tyinst_hdr ctxt tc tys + ; con' <- cvtConstr constr + ; derivs' <- cvtDerivs derivs + ; returnL $ TyClD (TyData { tcdND = NewType, tcdLName = tc', tcdCtxt = ctxt' + , tcdTyVars = tvs', tcdTyPats = typats', tcdKindSig = Nothing + , tcdCons = [con'], tcdDerivs = derivs' }) + } + +cvtTop (TySynInstD tc tys rhs) + = do { (_, tc', tvs', tys') <- cvt_tyinst_hdr [] tc tys + ; rhs' <- cvtType rhs + ; returnL $ TyClD (TySynonym tc' tvs' tys' rhs') } + +-- FIXME: This projection is not nice, but to remove it, cvtTop should be +-- refactored. +unTyClD :: LHsDecl a -> LTyClDecl a +unTyClD (L l (TyClD d)) = L l d +unTyClD _ = panic "Convert.unTyClD: internal error" + +cvt_tycl_hdr :: TH.Cxt -> TH.Name -> [TH.TyVarBndr] + -> CvtM ( LHsContext RdrName + , Located RdrName + , [LHsTyVarBndr RdrName]) cvt_tycl_hdr cxt tc tvs - = do { cxt' <- cvtContext cxt - ; tc' <- tconNameL tc - ; tvs' <- cvtTvs tvs - ; return (cxt', tc', tvs', Nothing) } + = do { cxt' <- cvtContext cxt + ; tc' <- tconNameL tc + ; tvs' <- cvtTvs tvs + ; return (cxt', tc', tvs') + } + +cvt_tyinst_hdr :: TH.Cxt -> TH.Name -> [TH.Type] + -> CvtM ( LHsContext RdrName + , Located RdrName + , [LHsTyVarBndr RdrName] + , Maybe [LHsType RdrName]) +cvt_tyinst_hdr cxt tc tys + = do { cxt' <- cvtContext cxt + ; tc' <- tconNameL tc + ; tvs <- concatMapM collect tys + ; tvs' <- cvtTvs tvs + ; tys' <- mapM cvtType tys + ; return (cxt', tc', tvs', Just tys') + } + where + collect (ForallT _ _ _) + = failWith $ text "Forall type not allowed as type parameter" + collect (VarT tv) = return [PlainTV tv] + collect (ConT _) = return [] + collect (TupleT _) = return [] + collect ArrowT = return [] + collect ListT = return [] + collect (AppT t1 t2) + = do { tvs1 <- collect t1 + ; tvs2 <- collect t2 + ; return $ tvs1 ++ tvs2 + } + collect (SigT (VarT tv) ki) = return [KindedTV tv ki] + collect (SigT ty _) = collect ty --------------------------------------------------- -- Data types @@ -173,20 +268,20 @@ cvtConstr (NormalC c strtys) = do { c' <- cNameL c ; cxt' <- returnL [] ; tys' <- mapM cvt_arg strtys - ; returnL $ ConDecl c' Explicit noExistentials cxt' (PrefixCon tys') ResTyH98 Nothing } + ; returnL $ mkSimpleConDecl c' noExistentials cxt' (PrefixCon tys') } cvtConstr (RecC c varstrtys) = do { c' <- cNameL c ; cxt' <- returnL [] ; args' <- mapM cvt_id_arg varstrtys - ; returnL $ ConDecl c' Explicit noExistentials cxt' (RecCon args') ResTyH98 Nothing } + ; returnL $ mkSimpleConDecl c' noExistentials cxt' (RecCon args') } cvtConstr (InfixC st1 c st2) = do { c' <- cNameL c ; cxt' <- returnL [] ; st1' <- cvt_arg st1 ; st2' <- cvt_arg st2 - ; returnL $ ConDecl c' Explicit noExistentials cxt' (InfixCon st1' st2') ResTyH98 Nothing } + ; returnL $ mkSimpleConDecl c' noExistentials cxt' (InfixCon st1' st2') } cvtConstr (ForallC tvs ctxt (ForallC tvs' ctxt' con')) = cvtConstr (ForallC (tvs ++ tvs') (ctxt ++ ctxt') con') @@ -196,8 +291,8 @@ cvtConstr (ForallC tvs ctxt con) ; tvs' <- cvtTvs tvs ; ctxt' <- cvtContext ctxt ; case con' of - ConDecl l _ [] (L _ []) x ResTyH98 _ - -> returnL $ ConDecl l Explicit tvs' ctxt' x ResTyH98 Nothing + ConDecl { con_qvars = [], con_cxt = L _ [] } + -> returnL $ con' { con_qvars = tvs', con_cxt = ctxt' } _ -> panic "ForallC: Can't happen" } cvt_arg :: (TH.Strict, TH.Type) -> CvtM (LHsType RdrName) @@ -233,7 +328,7 @@ cvtForD (ImportF callconv safety from nm ty) | Just (c_header, cis) <- parse_ccall_impent (TH.nameBase nm) from = do { nm' <- vNameL nm ; ty' <- cvtType ty - ; let i = CImport (cvt_conv callconv) safety' c_header nilFS cis + ; let i = CImport (cvt_conv callconv) safety' c_header cis ; return $ ForeignImport nm' ty' i } | otherwise @@ -263,26 +358,41 @@ parse_ccall_impent nm s Just ts -> parse_ccall_impent_static nm ts Nothing -> Nothing +-- XXX we should be sharing code with RdrHsSyn.parseCImport parse_ccall_impent_static :: String -> [String] -> Maybe (FastString, CImportSpec) parse_ccall_impent_static nm ts - = let ts' = case ts of - [ "&", cid] -> [ cid] - [fname, "&" ] -> [fname ] - [fname, "&", cid] -> [fname, cid] - _ -> ts - in case ts' of - [ cid] | is_cid cid -> Just (nilFS, mk_cid cid) - [fname, cid] | is_cid cid -> Just (mkFastString fname, mk_cid cid) - [ ] -> Just (nilFS, mk_cid nm) - [fname ] -> Just (mkFastString fname, mk_cid nm) - _ -> Nothing + = case ts of + [ ] -> mkFun nilFS nm + [ "&", cid] -> mkLbl nilFS cid + [fname, "&" ] -> mkLbl (mkFastString fname) nm + [fname, "&", cid] -> mkLbl (mkFastString fname) cid + [ "&" ] -> mkLbl nilFS nm + [fname, cid] -> mkFun (mkFastString fname) cid + [ cid] + | is_cid cid -> mkFun nilFS cid + | otherwise -> mkFun (mkFastString cid) nm + -- tricky case when there's a single string: "foo.h" is a header, + -- but "foo" is a C identifier, and we tell the difference by + -- checking for a valid C identifier (see is_cid below). + _anything_else -> Nothing + where is_cid :: String -> Bool is_cid x = all (/= '.') x && (isAlpha (head x) || head x == '_') - mk_cid :: String -> CImportSpec - mk_cid = CFunction . StaticTarget . mkFastString + mkLbl :: FastString -> String -> Maybe (FastString, CImportSpec) + mkLbl fname lbl = Just (fname, CLabel (mkFastString lbl)) + + mkFun :: FastString -> String -> Maybe (FastString, CImportSpec) + mkFun fname lbl = Just (fname, CFunction (StaticTarget (mkFastString lbl))) + +-- This code is tokenising something like "foo.h &bar", eg. +-- "" -> Just [] +-- "foo.h" -> Just ["foo.h"] +-- "foo.h &bar" -> Just ["foo.h","&","bar"] +-- "&" -> Just ["&"] +-- Nothing is returned for a parse error. lex_ccall_impent :: String -> Maybe [String] lex_ccall_impent "" = Just [] lex_ccall_impent ('&':xs) = fmap ("&":) $ lex_ccall_impent xs @@ -294,6 +404,35 @@ lex_ccall_impent xs = case span is_valid xs of where is_valid :: Char -> Bool is_valid c = isAscii c && (isAlphaNum c || c `elem` "._") +------------------------------------------ +-- Pragmas +------------------------------------------ + +cvtPragmaD :: Pragma -> CvtM (Sig RdrName) +cvtPragmaD (InlineP nm ispec) + = do { nm' <- vNameL nm + ; return $ InlineSig nm' (cvtInlineSpec (Just ispec)) + } +cvtPragmaD (SpecialiseP nm ty opt_ispec) + = do { nm' <- vNameL nm + ; ty' <- cvtType ty + ; return $ SpecSig nm' ty' (cvtInlineSpec opt_ispec) + } + +cvtInlineSpec :: Maybe TH.InlineSpec -> Hs.InlineSpec +cvtInlineSpec Nothing + = defaultInlineSpec +cvtInlineSpec (Just (TH.InlineSpec inline conlike opt_activation)) + = mkInlineSpec opt_activation' matchinfo inline + where + matchinfo = cvtRuleMatchInfo conlike + opt_activation' = fmap cvtActivation opt_activation + + cvtRuleMatchInfo False = FunLike + cvtRuleMatchInfo True = ConLike + + cvtActivation (False, phase) = ActiveBefore phase + cvtActivation (True , phase) = ActiveAfter phase --------------------------------------------------- -- Declarations @@ -301,22 +440,32 @@ lex_ccall_impent xs = case span is_valid xs of cvtDecs :: [TH.Dec] -> CvtM (HsLocalBinds RdrName) cvtDecs [] = return EmptyLocalBinds -cvtDecs ds = do { (binds,sigs) <- cvtBindsAndSigs ds +cvtDecs ds = do { (binds, sigs) <- cvtBindsAndSigs ds ; return (HsValBinds (ValBindsIn binds sigs)) } cvtBindsAndSigs :: [TH.Dec] -> CvtM (Bag (LHsBind RdrName), [LSig RdrName]) cvtBindsAndSigs ds - = do { binds' <- mapM cvtBind binds; sigs' <- mapM cvtSig sigs + = do { binds' <- mapM cvtBind binds + ; sigs' <- mapM cvtSig sigs ; return (listToBag binds', sigs') } where (sigs, binds) = partition is_sig ds - is_sig (TH.SigD _ _) = True - is_sig _ = False + is_sig (TH.SigD _ _) = True + is_sig (TH.PragmaD _) = True + is_sig _ = False cvtSig :: TH.Dec -> CvtM (LSig RdrName) cvtSig (TH.SigD nm ty) - = do { nm' <- vNameL nm; ty' <- cvtType ty; returnL (Hs.TypeSig nm' ty') } + = do { nm' <- vNameL nm + ; ty' <- cvtType ty + ; returnL (Hs.TypeSig nm' ty') + } +cvtSig (TH.PragmaD prag) + = do { prag' <- cvtPragmaD prag + ; returnL prag' + } +cvtSig _ = panic "Convert.cvtSig: Signature expected" cvtBind :: TH.Dec -> CvtM (LHsBind RdrName) -- Used only for declarations in a 'let/where' clause, @@ -327,6 +476,11 @@ cvtBind (TH.ValD (TH.VarP s) body ds) ; returnL $ mkFunBind s' [cl'] } cvtBind (TH.FunD nm cls) + | null cls + = failWith (ptext (sLit "Function binding for") + <+> quotes (text (TH.pprint nm)) + <+> ptext (sLit "has no equations")) + | otherwise = do { nm' <- vNameL nm ; cls' <- mapM cvtClause cls ; returnL $ mkFunBind nm' cls' } @@ -371,19 +525,26 @@ cvtl e = wrapL (cvt e) cvt (CondE x y z) = do { x' <- cvtl x; y' <- cvtl y; z' <- cvtl z ; return $ HsIf x' y' z' } cvt (LetE ds e) = do { ds' <- cvtDecs ds; e' <- cvtl e; return $ HsLet ds' e' } - cvt (CaseE e ms) = do { e' <- cvtl e; ms' <- mapM cvtMatch ms + cvt (CaseE e ms) + | null ms = failWith (ptext (sLit "Case expression with no alternatives")) + | otherwise = do { e' <- cvtl e; ms' <- mapM cvtMatch ms ; return $ HsCase e' (mkMatchGroup ms') } cvt (DoE ss) = cvtHsDo DoExpr ss cvt (CompE ss) = cvtHsDo ListComp ss cvt (ArithSeqE dd) = do { dd' <- cvtDD dd; return $ ArithSeq noPostTcExpr dd' } - cvt (ListE xs) = do { xs' <- mapM cvtl xs; return $ ExplicitList void xs' } + cvt (ListE xs) + | Just s <- allCharLs xs = do { l' <- cvtLit (StringL s); return (HsLit l') } + -- Note [Converting strings] + | otherwise = do { xs' <- mapM cvtl xs; return $ ExplicitList void xs' } cvt (InfixE (Just x) s (Just y)) = do { x' <- cvtl x; s' <- cvtl s; y' <- cvtl y ; e' <- returnL $ OpApp x' s' undefined y' ; return $ HsPar e' } cvt (InfixE Nothing s (Just y)) = do { s' <- cvtl s; y' <- cvtl y - ; return $ SectionR s' y' } + ; sec <- returnL $ SectionR s' y' + ; return $ HsPar sec } cvt (InfixE (Just x) s Nothing ) = do { x' <- cvtl x; s' <- cvtl s - ; return $ SectionL x' s' } + ; sec <- returnL $ SectionL x' s' + ; return $ HsPar sec } cvt (InfixE Nothing s Nothing ) = cvt s -- Can I indicate this is an infix thing? cvt (SigE e t) = do { e' <- cvtl e; t' <- cvtType t @@ -412,9 +573,12 @@ cvtDD (FromThenToR x y z) = do { x' <- cvtl x; y' <- cvtl y; z' <- cvtl z; retur cvtHsDo :: HsStmtContext Name.Name -> [TH.Stmt] -> CvtM (HsExpr RdrName) cvtHsDo do_or_lc stmts + | null stmts = failWith (ptext (sLit "Empty stmt list in do-block")) + | otherwise = do { stmts' <- cvtStmts stmts ; let body = case last stmts' of L _ (ExprStmt body _ _) -> body + _ -> panic "Malformed body" ; return $ HsDo do_or_lc (init stmts') body void } cvtStmts :: [TH.Stmt] -> CvtM [Hs.LStmt RdrName] @@ -447,19 +611,46 @@ cvtpair (PatG gs,rhs) = do { gs' <- cvtStmts gs; rhs' <- cvtl rhs ; returnL $ GRHS gs' rhs' } cvtOverLit :: Lit -> CvtM (HsOverLit RdrName) -cvtOverLit (IntegerL i) = do { force i; return $ mkHsIntegral i placeHolderType} -cvtOverLit (RationalL r) = do { force r; return $ mkHsFractional r placeHolderType} -cvtOverLit (StringL s) = do { let { s' = mkFastString s }; force s'; return $ mkHsIsString s' placeHolderType } --- An Integer is like an an (overloaded) '3' in a Haskell source program +cvtOverLit (IntegerL i) + = do { force i; return $ mkHsIntegral i placeHolderType} +cvtOverLit (RationalL r) + = do { force r; return $ mkHsFractional r placeHolderType} +cvtOverLit (StringL s) + = do { let { s' = mkFastString s } + ; force s' + ; return $ mkHsIsString s' placeHolderType + } +cvtOverLit _ = panic "Convert.cvtOverLit: Unexpected overloaded literal" +-- An Integer is like an (overloaded) '3' in a Haskell source program -- Similarly 3.5 for fractionals +{- Note [Converting strings] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +If we get (ListE [CharL 'x', CharL 'y']) we'd like to convert to +a string literal for "xy". Of course, we might hope to get +(LitE (StringL "xy")), but not always, and allCharLs fails quickly +if it isn't a literal string +-} + +allCharLs :: [TH.Exp] -> Maybe String +-- Note [Converting strings] +allCharLs (LitE (CharL c) : xs) + | Just cs <- allCharLs xs = Just (c:cs) +allCharLs [] = Just [] +allCharLs _ = Nothing + cvtLit :: Lit -> CvtM HsLit cvtLit (IntPrimL i) = do { force i; return $ HsIntPrim i } cvtLit (WordPrimL w) = do { force w; return $ HsWordPrim w } cvtLit (FloatPrimL f) = do { force f; return $ HsFloatPrim f } cvtLit (DoublePrimL f) = do { force f; return $ HsDoublePrim f } cvtLit (CharL c) = do { force c; return $ HsChar c } -cvtLit (StringL s) = do { let { s' = mkFastString s }; force s'; return $ HsString s' } +cvtLit (StringL s) + = do { let { s' = mkFastString s } + ; force s' + ; return $ HsString s' + } +cvtLit _ = panic "Convert.cvtLit: Unexpected literal" cvtPats :: [TH.Pat] -> CvtM [Hs.LPat RdrName] cvtPats pats = mapM cvtPat pats @@ -481,6 +672,7 @@ cvtp (ConP s ps) = do { s' <- cNameL s; ps' <- cvtPats ps; return $ ConPatI cvtp (InfixP p1 s p2) = do { s' <- cNameL s; p1' <- cvtPat p1; p2' <- cvtPat p2 ; return $ ConPatIn s' (InfixCon p1' p2') } cvtp (TildeP p) = do { p' <- cvtPat p; return $ LazyPat p' } +cvtp (BangP p) = do { p' <- cvtPat p; return $ BangPat p' } cvtp (TH.AsP s p) = do { s' <- vNameL s; p' <- cvtPat p; return $ AsPat s' p' } cvtp TH.WildP = return $ WildPat void cvtp (RecP c fs) = do { c' <- cNameL c; fs' <- mapM cvtPatFld fs @@ -496,43 +688,80 @@ cvtPatFld (s,p) ----------------------------------------------------------- -- Types and type variables -cvtTvs :: [TH.Name] -> CvtM [LHsTyVarBndr RdrName] +cvtTvs :: [TH.TyVarBndr] -> CvtM [LHsTyVarBndr RdrName] cvtTvs tvs = mapM cvt_tv tvs -cvt_tv :: TH.Name -> CvtM (LHsTyVarBndr RdrName) -cvt_tv tv = do { tv' <- tName tv; returnL $ UserTyVar tv' } - -cvtContext :: Cxt -> CvtM (LHsContext RdrName) +cvt_tv :: TH.TyVarBndr -> CvtM (LHsTyVarBndr RdrName) +cvt_tv (TH.PlainTV nm) + = do { nm' <- tName nm + ; returnL $ UserTyVar nm' + } +cvt_tv (TH.KindedTV nm ki) + = do { nm' <- tName nm + ; returnL $ KindedTyVar nm' (cvtKind ki) + } + +cvtContext :: TH.Cxt -> CvtM (LHsContext RdrName) cvtContext tys = do { preds' <- mapM cvtPred tys; returnL preds' } -cvtPred :: TH.Type -> CvtM (LHsPred RdrName) -cvtPred ty +cvtPred :: TH.Pred -> CvtM (LHsPred RdrName) +cvtPred (TH.ClassP cla tys) + = do { cla' <- if isVarName cla then tName cla else tconName cla + ; tys' <- mapM cvtType tys + ; returnL $ HsClassP cla' tys' + } +cvtPred (TH.EqualP ty1 ty2) + = do { ty1' <- cvtType ty1 + ; ty2' <- cvtType ty2 + ; returnL $ HsEqualP ty1' ty2' + } + +cvtPredTy :: TH.Type -> CvtM (LHsPred RdrName) +cvtPredTy ty = do { (head, tys') <- split_ty_app ty ; case head of ConT tc -> do { tc' <- tconName tc; returnL $ HsClassP tc' tys' } VarT tv -> do { tv' <- tName tv; returnL $ HsClassP tv' tys' } - _ -> failWith (ptext (sLit "Malformed predicate") <+> text (TH.pprint ty)) } + _ -> failWith (ptext (sLit "Malformed predicate") <+> + text (TH.pprint ty)) } cvtType :: TH.Type -> CvtM (LHsType RdrName) -cvtType ty = do { (head_ty, tys') <- split_ty_app ty - ; case head_ty of - TupleT n | length tys' == n -- Saturated - -> if n==1 then return (head tys') -- Singleton tuples treated - -- like nothing (ie just parens) - else returnL (HsTupleTy Boxed tys') - | n == 1 -> failWith (ptext (sLit "Illegal 1-tuple type constructor")) - | otherwise -> mk_apps (HsTyVar (getRdrName (tupleTyCon Boxed n))) tys' - ArrowT | [x',y'] <- tys' -> returnL (HsFunTy x' y') - ListT | [x'] <- tys' -> returnL (HsListTy x') - VarT nm -> do { nm' <- tName nm; mk_apps (HsTyVar nm') tys' } - ConT nm -> do { nm' <- tconName nm; mk_apps (HsTyVar nm') tys' } - - ForallT tvs cxt ty | null tys' -> do { tvs' <- cvtTvs tvs - ; cxt' <- cvtContext cxt - ; ty' <- cvtType ty - ; returnL $ mkExplicitHsForAllTy tvs' cxt' ty' } - _ -> failWith (ptext (sLit "Malformed type") <+> text (show ty)) - } +cvtType ty + = do { (head_ty, tys') <- split_ty_app ty + ; case head_ty of + TupleT n + | length tys' == n -- Saturated + -> if n==1 then return (head tys') -- Singleton tuples treated + -- like nothing (ie just parens) + else returnL (HsTupleTy Boxed tys') + | n == 1 + -> failWith (ptext (sLit "Illegal 1-tuple type constructor")) + | otherwise + -> mk_apps (HsTyVar (getRdrName (tupleTyCon Boxed n))) tys' + ArrowT + | [x',y'] <- tys' -> returnL (HsFunTy x' y') + | otherwise -> mk_apps (HsTyVar (getRdrName funTyCon)) tys' + ListT + | [x'] <- tys' -> returnL (HsListTy x') + | otherwise -> mk_apps (HsTyVar (getRdrName listTyCon)) tys' + VarT nm -> do { nm' <- tName nm; mk_apps (HsTyVar nm') tys' } + ConT nm -> do { nm' <- tconName nm; mk_apps (HsTyVar nm') tys' } + + ForallT tvs cxt ty + | null tys' + -> do { tvs' <- cvtTvs tvs + ; cxt' <- cvtContext cxt + ; ty' <- cvtType ty + ; returnL $ mkExplicitHsForAllTy tvs' cxt' ty' + } + + SigT ty ki + -> do { ty' <- cvtType ty + ; mk_apps (HsKindSig ty' (cvtKind ki)) tys' + } + + _ -> failWith (ptext (sLit "Malformed type") <+> text (show ty)) + } where mk_apps head_ty [] = returnL head_ty mk_apps head_ty (ty:tys) = do { head_ty' <- returnL head_ty @@ -544,6 +773,10 @@ split_ty_app ty = go ty [] go (AppT f a) as' = do { a' <- cvtType a; go f (a':as') } go f as = return (f,as) +cvtKind :: TH.Kind -> Type.Kind +cvtKind StarK = liftedTypeKind +cvtKind (ArrowK k1 k2) = mkArrowKind (cvtKind k1) (cvtKind k2) + ----------------------------------------------------------- @@ -591,8 +824,16 @@ cvtName ctxt_ns (TH.Name occ flavour) okOcc :: OccName.NameSpace -> String -> Bool okOcc _ [] = False okOcc ns str@(c:_) - | OccName.isVarName ns = startsVarId c || startsVarSym c - | otherwise = startsConId c || startsConSym c || str == "[]" + | OccName.isVarNameSpace ns = startsVarId c || startsVarSym c + | otherwise = startsConId c || startsConSym c || str == "[]" + +-- Determine the name space of a name in a type +-- +isVarName :: TH.Name -> Bool +isVarName (TH.Name occ _) + = case TH.occString occ of + "" -> False + (c:_) -> startsVarId c || startsVarSym c badOcc :: OccName.NameSpace -> String -> SDoc badOcc ctxt_ns occ @@ -610,7 +851,7 @@ thRdrName :: OccName.NameSpace -> String -> TH.NameFlavour -> RdrName -- which will give confusing error messages later -- -- The strict applications ensure that any buried exceptions get forced -thRdrName _ occ (TH.NameG th_ns pkg mod) = (mkOrig $! (mkModule (mk_pkg pkg) (mk_mod mod))) $! (mk_occ (mk_ghc_ns th_ns) occ) +thRdrName _ occ (TH.NameG th_ns pkg mod) = thOrigRdrName occ th_ns pkg mod thRdrName ctxt_ns occ (TH.NameL uniq) = nameRdrName $! (((Name.mkInternalName $! (mk_uniq uniq)) $! (mk_occ ctxt_ns occ)) noSrcSpan) thRdrName ctxt_ns occ (TH.NameQ mod) = (mkRdrQual $! (mk_mod mod)) $! (mk_occ ctxt_ns occ) thRdrName ctxt_ns occ (TH.NameU uniq) = mkRdrUnqual $! (mk_uniq_occ ctxt_ns occ uniq) @@ -618,6 +859,21 @@ thRdrName ctxt_ns occ TH.NameS | Just name <- isBuiltInOcc ctxt_ns occ = nameRdrName $! name | otherwise = mkRdrUnqual $! (mk_occ ctxt_ns occ) +thOrigRdrName :: String -> TH.NameSpace -> PkgName -> ModName -> RdrName +thOrigRdrName occ th_ns pkg mod = (mkOrig $! (mkModule (mk_pkg pkg) (mk_mod mod))) $! (mk_occ (mk_ghc_ns th_ns) occ) + +thRdrNameGuesses :: TH.Name -> [RdrName] +thRdrNameGuesses (TH.Name occ flavour) + -- This special case for NameG ensures that we don't generate duplicates in the output list + | TH.NameG th_ns pkg mod <- flavour = [thOrigRdrName occ_str th_ns pkg mod] + | otherwise = [ thRdrName gns occ_str flavour + | gns <- guessed_nss] + where + -- guessed_ns are the name spaces guessed from looking at the TH name + guessed_nss | isLexCon (mkFastString occ_str) = [OccName.tcName, OccName.dataName] + | otherwise = [OccName.varName, OccName.tvName] + occ_str = TH.occString occ + isBuiltInOcc :: OccName.NameSpace -> String -> Maybe Name.Name -- Built in syntax isn't "in scope" so an Unqual RdrName won't do -- We must generate an Exact name, just as the parser does @@ -634,8 +890,8 @@ isBuiltInOcc ctxt_ns occ go_tuple _ _ = Nothing tup_name n - | OccName.isTcClsName ctxt_ns = Name.getName (tupleTyCon Boxed n) - | otherwise = Name.getName (tupleCon Boxed n) + | OccName.isTcClsNameSpace ctxt_ns = Name.getName (tupleTyCon Boxed n) + | otherwise = Name.getName (tupleCon Boxed n) mk_uniq_occ :: OccName.NameSpace -> String -> Int# -> OccName.OccName mk_uniq_occ ns occ uniq @@ -661,7 +917,7 @@ mk_ghc_ns TH.VarName = OccName.varName mk_mod :: TH.ModName -> ModuleName mk_mod mod = mkModuleName (TH.modString mod) -mk_pkg :: TH.ModName -> PackageId +mk_pkg :: TH.PkgName -> PackageId mk_pkg pkg = stringToPackageId (TH.pkgString pkg) mk_uniq :: Int# -> Unique