X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FConvert.lhs;h=7343a8baa49f7203a8433a00be9baac60ed85c39;hb=ff845ab59d1d465d874d3908fd0cdd61b8594da2;hp=db6c7adcc5e838a8c89caa4c35e5833a75639797;hpb=7c6461be3cc9e17d5f2b5bb8b8b0c9ea6fecb75d;p=ghc-hetmet.git diff --git a/ghc/compiler/hsSyn/Convert.lhs b/ghc/compiler/hsSyn/Convert.lhs index db6c7ad..7343a8b 100644 --- a/ghc/compiler/hsSyn/Convert.lhs +++ b/ghc/compiler/hsSyn/Convert.lhs @@ -6,109 +6,119 @@ This module converts Template Haskell syntax into HsSyn \begin{code} -module Convert( convertToHsExpr, convertToHsDecls ) where +module Convert( convertToHsExpr, convertToHsDecls, convertToHsType ) where #include "HsVersions.h" -import Language.Haskell.THSyntax as Meta +import Language.Haskell.TH as TH hiding (sigP) +import Language.Haskell.TH.Syntax as TH import HsSyn as Hs - ( HsExpr(..), HsLit(..), ArithSeqInfo(..), - HsStmtContext(..), TyClDecl(..), - Match(..), GRHSs(..), GRHS(..), HsPred(..), - HsDecl(..), TyClDecl(..), InstDecl(..), ConDecl(..), - Stmt(..), HsBinds(..), MonoBinds(..), Sig(..), - Pat(..), HsConDetails(..), HsOverLit, BangType(..), - placeHolderType, HsType(..), HsTupCon(..), - HsTyVarBndr(..), HsContext, - mkSimpleMatch, mkHsForAllTy - ) - -import RdrName ( RdrName, mkRdrUnqual, mkRdrQual, mkOrig ) -import Module ( mkModuleName ) +import qualified Class (FunDep) +import RdrName ( RdrName, mkRdrUnqual, mkRdrQual, mkOrig, nameRdrName, getRdrName ) +import Module ( ModuleName, mkModuleName ) import RdrHsSyn ( mkHsIntegral, mkHsFractional, mkClassDecl, mkTyData ) -import OccName -import SrcLoc ( SrcLoc, generatedSrcLoc ) -import TyCon ( DataConDetails(..) ) +import Name ( mkInternalName ) +import qualified OccName +import SrcLoc ( SrcLoc, generatedSrcLoc, noLoc, unLoc, Located(..), + noSrcSpan, SrcSpan, srcLocSpan, noSrcLoc ) import Type ( Type ) -import BasicTypes( Boxity(..), RecFlag(Recursive), - NewOrData(..), StrictnessMark(..) ) -import ForeignCall ( Safety(..), CCallConv(..), CCallTarget(..) ) -import HsDecls ( CImportSpec(..), ForeignImport(..), ForeignDecl(..) ) +import TysWiredIn ( unitTyCon, tupleTyCon, trueDataCon, falseDataCon ) +import BasicTypes( Boxity(..), RecFlag(Recursive) ) +import ForeignCall ( Safety(..), CCallConv(..), CCallTarget(..), + CExportSpec(..)) +import HsDecls ( CImportSpec(..), ForeignImport(..), ForeignExport(..), + ForeignDecl(..) ) import FastString( FastString, mkFastString, nilFS ) import Char ( ord, isAscii, isAlphaNum, isAlpha ) import List ( partition ) +import Unique ( Unique, mkUniqueGrimily ) import ErrUtils (Message) +import GLAEXTS ( Int#, Int(..) ) +import Bag ( emptyBag, consBag ) import Outputable ------------------------------------------------------------------- -convertToHsDecls :: [Meta.Dec] -> [Either (HsDecl RdrName) Message] -convertToHsDecls ds = map cvt_top ds +convertToHsDecls :: [TH.Dec] -> [Either (LHsDecl RdrName) Message] +convertToHsDecls ds = map cvt_ltop ds -mk_con con = case con of +mk_con con = L loc0 $ mk_nlcon con + where + mk_nlcon con = case con of NormalC c strtys - -> ConDecl (cName c) noExistentials noContext - (PrefixCon (map mk_arg strtys)) loc0 + -> ConDecl (noLoc (cName c)) noExistentials noContext + (PrefixCon (map mk_arg strtys)) RecC c varstrtys - -> ConDecl (cName c) noExistentials noContext - (RecCon (map mk_id_arg varstrtys)) loc0 + -> ConDecl (noLoc (cName c)) noExistentials noContext + (RecCon (map mk_id_arg varstrtys)) InfixC st1 c st2 - -> ConDecl (cName c) noExistentials noContext - (InfixCon (mk_arg st1) (mk_arg st2)) loc0 - where - mk_arg (IsStrict, ty) = BangType MarkedUserStrict (cvtType ty) - mk_arg (NotStrict, ty) = BangType NotMarkedStrict (cvtType ty) + -> ConDecl (noLoc (cName c)) noExistentials noContext + (InfixCon (mk_arg st1) (mk_arg st2)) + ForallC tvs ctxt (ForallC tvs' ctxt' con') + -> mk_nlcon (ForallC (tvs ++ tvs') (ctxt ++ ctxt') con') + ForallC tvs ctxt con' -> case mk_nlcon con' of + ConDecl l [] (L _ []) x -> + ConDecl l (cvt_tvs tvs) (cvt_context ctxt) x + c -> panic "ForallC: Can't happen" + mk_arg (IsStrict, ty) = noLoc $ HsBangTy HsStrict (cvtType ty) + mk_arg (NotStrict, ty) = cvtType ty mk_id_arg (i, IsStrict, ty) - = (vName i, BangType MarkedUserStrict (cvtType ty)) + = (noLoc (vName i), noLoc $ HsBangTy HsStrict (cvtType ty)) mk_id_arg (i, NotStrict, ty) - = (vName i, BangType NotMarkedStrict (cvtType ty)) + = (noLoc (vName i), cvtType ty) mk_derivs [] = Nothing -mk_derivs cs = Just [HsClassP (tconName c) [] | c <- cs] +mk_derivs cs = Just [noLoc $ HsPredTy $ HsClassP (tconName c) [] | c <- cs] -cvt_top :: Meta.Dec -> Either (HsDecl RdrName) Message -cvt_top d@(Meta.ValD _ _ _) = Left $ Hs.ValD (cvtd d) -cvt_top d@(Meta.FunD _ _) = Left $ Hs.ValD (cvtd d) +cvt_ltop :: TH.Dec -> Either (LHsDecl RdrName) Message +cvt_ltop d = case cvt_top d of + Left d -> Left (L loc0 d) + Right m -> Right m + +cvt_top :: TH.Dec -> Either (HsDecl RdrName) Message +cvt_top d@(TH.ValD _ _ _) = Left $ Hs.ValD (unLoc (cvtd d)) +cvt_top d@(TH.FunD _ _) = Left $ Hs.ValD (unLoc (cvtd d)) cvt_top (TySynD tc tvs rhs) - = Left $ TyClD (TySynonym (tconName tc) (cvt_tvs tvs) (cvtType rhs) loc0) + = Left $ TyClD (TySynonym (noLoc (tconName tc)) (cvt_tvs tvs) (cvtType rhs)) cvt_top (DataD ctxt tc tvs constrs derivs) = Left $ TyClD (mkTyData DataType - (cvt_context ctxt, tconName tc, cvt_tvs tvs) - (DataCons (map mk_con constrs)) - (mk_derivs derivs) loc0) + (noLoc (cvt_context ctxt, noLoc (tconName tc), cvt_tvs tvs)) + Nothing (map mk_con constrs) + (mk_derivs derivs)) cvt_top (NewtypeD ctxt tc tvs constr derivs) = Left $ TyClD (mkTyData NewType - (cvt_context ctxt, tconName tc, cvt_tvs tvs) - (DataCons [mk_con constr]) - (mk_derivs derivs) loc0) - -cvt_top (ClassD ctxt cl tvs decs) - = Left $ TyClD (mkClassDecl (cvt_context ctxt, tconName cl, cvt_tvs tvs) - noFunDeps sigs - (Just binds) loc0) + (noLoc (cvt_context ctxt, noLoc (tconName tc), cvt_tvs tvs)) + Nothing [mk_con constr] + (mk_derivs derivs)) + +cvt_top (ClassD ctxt cl tvs fds decs) + = Left $ TyClD $ mkClassDecl (cvt_context ctxt, + noLoc (tconName cl), + cvt_tvs tvs) + (map (noLoc . cvt_fundep) fds) + sigs + binds where (binds,sigs) = cvtBindsAndSigs decs cvt_top (InstanceD tys ty decs) - = Left $ InstD (InstDecl inst_ty binds sigs Nothing loc0) + = Left $ InstD (InstDecl (noLoc inst_ty) binds sigs) where (binds, sigs) = cvtBindsAndSigs decs - inst_ty = HsForAllTy Nothing - (cvt_context tys) - (HsPredTy (cvt_pred ty)) + inst_ty = mkImplicitHsForAllTy (cvt_context tys) (noLoc (HsPredTy (cvt_pred ty))) -cvt_top (Meta.SigD nm typ) = Left $ Hs.SigD (Sig (vName nm) (cvtType typ) loc0) +cvt_top (TH.SigD nm typ) = Left $ Hs.SigD (Sig (noLoc (vName nm)) (cvtType typ)) cvt_top (ForeignD (ImportF callconv safety from nm typ)) = case parsed of Just (c_header, cis) -> let i = CImport callconv' safety' c_header nilFS cis - in Left $ ForD (ForeignImport (vName nm) (cvtType typ) i False loc0) + in Left $ ForD (ForeignImport (noLoc (vName nm)) (cvtType typ) i False) Nothing -> Right $ text (show from) <+> ptext SLIT("is not a valid ccall impent") where callconv' = case callconv of @@ -118,7 +128,17 @@ cvt_top (ForeignD (ImportF callconv safety from nm typ)) Unsafe -> PlayRisky Safe -> PlaySafe False Threadsafe -> PlaySafe True - parsed = parse_ccall_impent nm from + parsed = parse_ccall_impent (TH.nameBase nm) from + +cvt_top (ForeignD (ExportF callconv as nm typ)) + = let e = CExport (CExportStatic (mkFastString as) callconv') + in Left $ ForD (ForeignExport (noLoc (vName nm)) (cvtType typ) e False) + where callconv' = case callconv of + CCall -> CCallConv + StdCall -> StdCallConv + +cvt_fundep :: FunDep -> Class.FunDep RdrName +cvt_fundep (FunDep xs ys) = (map tName xs, map tName ys) parse_ccall_impent :: String -> String -> Maybe (FastString, CImportSpec) parse_ccall_impent nm s @@ -160,13 +180,14 @@ lex_ccall_impent xs = case span is_valid xs of where is_valid :: Char -> Bool is_valid c = isAscii c && (isAlphaNum c || c `elem` "._") -noContext = [] +noContext = noLoc [] noExistentials = [] -noFunDeps = [] ------------------------------------------------------------------- -convertToHsExpr :: Meta.Exp -> HsExpr RdrName -convertToHsExpr = cvt +convertToHsExpr :: TH.Exp -> LHsExpr RdrName +convertToHsExpr = cvtl + +cvtl e = noLoc (cvt e) cvt (VarE s) = HsVar (vName s) cvt (ConE s) = HsVar (cName s) @@ -174,29 +195,29 @@ cvt (LitE l) | overloadedLit l = HsOverLit (cvtOverLit l) | otherwise = HsLit (cvtLit l) -cvt (AppE x y) = HsApp (cvt x) (cvt y) -cvt (LamE ps e) = HsLam (mkSimpleMatch (map cvtp ps) (cvt e) void loc0) +cvt (AppE x y) = HsApp (cvtl x) (cvtl y) +cvt (LamE ps e) = HsLam (mkMatchGroup [mkSimpleMatch (map cvtlp ps) (cvtl e)]) cvt (TupE [e]) = cvt e -cvt (TupE es) = ExplicitTuple(map cvt es) Boxed -cvt (CondE x y z) = HsIf (cvt x) (cvt y) (cvt z) loc0 -cvt (LetE ds e) = HsLet (cvtdecs ds) (cvt e) -cvt (CaseE e ms) = HsCase (cvt e) (map cvtm ms) loc0 -cvt (DoE ss) = HsDo DoExpr (cvtstmts ss) [] void loc0 -cvt (CompE ss) = HsDo ListComp (cvtstmts ss) [] void loc0 +cvt (TupE es) = ExplicitTuple(map cvtl es) Boxed +cvt (CondE x y z) = HsIf (cvtl x) (cvtl y) (cvtl z) +cvt (LetE ds e) = HsLet (cvtdecs ds) (cvtl e) +cvt (CaseE e ms) = HsCase (cvtl e) (mkMatchGroup (map cvtm ms)) +cvt (DoE ss) = HsDo DoExpr (cvtstmts ss) [] void +cvt (CompE ss) = HsDo ListComp (cvtstmts ss) [] void cvt (ArithSeqE dd) = ArithSeqIn (cvtdd dd) -cvt (ListE xs) = ExplicitList void (map cvt xs) +cvt (ListE xs) = ExplicitList void (map cvtl xs) cvt (InfixE (Just x) s (Just y)) - = HsPar (OpApp (cvt x) (cvt s) undefined (cvt y)) -cvt (InfixE Nothing s (Just y)) = SectionR (cvt s) (cvt y) -cvt (InfixE (Just x) s Nothing ) = SectionL (cvt x) (cvt s) + = HsPar (noLoc $ OpApp (cvtl x) (cvtl s) undefined (cvtl y)) +cvt (InfixE Nothing s (Just y)) = SectionR (cvtl s) (cvtl y) +cvt (InfixE (Just x) s Nothing ) = SectionL (cvtl x) (cvtl s) cvt (InfixE Nothing s Nothing ) = cvt s -- Can I indicate this is an infix thing? -cvt (SigE e t) = ExprWithTySig (cvt e) (cvtType t) -cvt (RecConE c flds) = RecordCon (cName c) (map (\(x,y) -> (vName x, cvt y)) flds) -cvt (RecUpdE e flds) = RecordUpd (cvt e) (map (\(x,y) -> (vName x, cvt y)) flds) +cvt (SigE e t) = ExprWithTySig (cvtl e) (cvtType t) +cvt (RecConE c flds) = RecordCon (noLoc (cName c)) (map (\(x,y) -> (noLoc (vName x), cvtl y)) flds) +cvt (RecUpdE e flds) = RecordUpd (cvtl e) (map (\(x,y) -> (noLoc (vName x), cvtl y)) flds) -cvtdecs :: [Meta.Dec] -> HsBinds RdrName -cvtdecs [] = EmptyBinds -cvtdecs ds = MonoBind binds sigs Recursive +cvtdecs :: [TH.Dec] -> [HsBindGroup RdrName] +cvtdecs [] = [] +cvtdecs ds = [HsBindGroup binds sigs Recursive] where (binds, sigs) = cvtBindsAndSigs ds @@ -205,57 +226,59 @@ cvtBindsAndSigs ds where (sigs, non_sigs) = partition sigP ds -cvtSig (Meta.SigD nm typ) = Hs.Sig (vName nm) (cvtType typ) loc0 +cvtSig (TH.SigD nm typ) = noLoc (Hs.Sig (noLoc (vName nm)) (cvtType typ)) -cvtds :: [Meta.Dec] -> MonoBinds RdrName -cvtds [] = EmptyMonoBinds -cvtds (d:ds) = AndMonoBinds (cvtd d) (cvtds ds) +cvtds :: [TH.Dec] -> LHsBinds RdrName +cvtds [] = emptyBag +cvtds (d:ds) = cvtd d `consBag` cvtds ds -cvtd :: Meta.Dec -> MonoBinds RdrName +cvtd :: TH.Dec -> LHsBind RdrName -- Used only for declarations in a 'let/where' clause, -- not for top level decls -cvtd (Meta.ValD (Meta.VarP s) body ds) = FunMonoBind (vName s) False - [cvtclause (Clause [] body ds)] loc0 -cvtd (FunD nm cls) = FunMonoBind (vName nm) False (map cvtclause cls) loc0 -cvtd (Meta.ValD p body ds) = PatMonoBind (cvtp p) (GRHSs (cvtguard body) - (cvtdecs ds) - void) loc0 -cvtd x = panic "Illegal kind of declaration in where clause" +cvtd (TH.ValD (TH.VarP s) body ds) + = noLoc $ FunBind (noLoc (vName s)) False (mkMatchGroup [cvtclause (Clause [] body ds)]) +cvtd (FunD nm cls) + = noLoc $ FunBind (noLoc (vName nm)) False (mkMatchGroup (map cvtclause cls)) +cvtd (TH.ValD p body ds) + = noLoc $ PatBind (cvtlp p) (GRHSs (cvtguard body) (cvtdecs ds)) void + +cvtd d = cvtPanic "Illegal kind of declaration in where clause" + (text (TH.pprint d)) -cvtclause :: Meta.Clause -> Hs.Match RdrName +cvtclause :: TH.Clause -> Hs.LMatch RdrName cvtclause (Clause ps body wheres) - = Hs.Match (map cvtp ps) Nothing (GRHSs (cvtguard body) (cvtdecs wheres) void) + = noLoc $ Hs.Match (map cvtlp ps) Nothing (GRHSs (cvtguard body) (cvtdecs wheres)) cvtdd :: Range -> ArithSeqInfo RdrName -cvtdd (FromR x) = (From (cvt x)) -cvtdd (FromThenR x y) = (FromThen (cvt x) (cvt y)) -cvtdd (FromToR x y) = (FromTo (cvt x) (cvt y)) -cvtdd (FromThenToR x y z) = (FromThenTo (cvt x) (cvt y) (cvt z)) - - -cvtstmts :: [Meta.Stmt] -> [Hs.Stmt RdrName] -cvtstmts [] = [] -- this is probably an error as every [stmt] should end with ResultStmt -cvtstmts [NoBindS e] = [ResultStmt (cvt e) loc0] -- when its the last element use ResultStmt -cvtstmts (NoBindS e : ss) = ExprStmt (cvt e) void loc0 : cvtstmts ss -cvtstmts (Meta.BindS p e : ss) = BindStmt (cvtp p) (cvt e) loc0 : cvtstmts ss -cvtstmts (Meta.LetS ds : ss) = LetStmt (cvtdecs ds) : cvtstmts ss -cvtstmts (Meta.ParS dss : ss) = ParStmt(map cvtstmts dss) : cvtstmts ss - - -cvtm :: Meta.Match -> Hs.Match RdrName -cvtm (Meta.Match p body wheres) - = Hs.Match [cvtp p] Nothing (GRHSs (cvtguard body) (cvtdecs wheres) void) - -cvtguard :: Meta.Body -> [GRHS RdrName] +cvtdd (FromR x) = (From (cvtl x)) +cvtdd (FromThenR x y) = (FromThen (cvtl x) (cvtl y)) +cvtdd (FromToR x y) = (FromTo (cvtl x) (cvtl y)) +cvtdd (FromThenToR x y z) = (FromThenTo (cvtl x) (cvtl y) (cvtl z)) + + +cvtstmts :: [TH.Stmt] -> [Hs.LStmt RdrName] +cvtstmts [] = [] -- this is probably an error as every [stmt] should end with ResultStmt +cvtstmts [NoBindS e] = [nlResultStmt (cvtl e)] -- when its the last element use ResultStmt +cvtstmts (NoBindS e : ss) = nlExprStmt (cvtl e) : cvtstmts ss +cvtstmts (TH.BindS p e : ss) = nlBindStmt (cvtlp p) (cvtl e) : cvtstmts ss +cvtstmts (TH.LetS ds : ss) = nlLetStmt (cvtdecs ds) : cvtstmts ss +cvtstmts (TH.ParS dss : ss) = nlParStmt [(cvtstmts ds, undefined) | ds <- dss] : cvtstmts ss + +cvtm :: TH.Match -> Hs.LMatch RdrName +cvtm (TH.Match p body wheres) + = noLoc (Hs.Match [cvtlp p] Nothing (GRHSs (cvtguard body) (cvtdecs wheres))) + +cvtguard :: TH.Body -> [LGRHS RdrName] cvtguard (GuardedB pairs) = map cvtpair pairs -cvtguard (NormalB e) = [GRHS [ ResultStmt (cvt e) loc0 ] loc0] +cvtguard (NormalB e) = [noLoc (GRHS [ nlResultStmt (cvtl e) ])] -cvtpair :: (Meta.Exp,Meta.Exp) -> GRHS RdrName -cvtpair (x,y) = GRHS [Hs.BindStmt truePat (cvt x) loc0, - ResultStmt (cvt y) loc0] loc0 +cvtpair :: (TH.Guard,TH.Exp) -> LGRHS RdrName +cvtpair (NormalG x,y) = noLoc (GRHS [nlBindStmt truePat (cvtl x), + nlResultStmt (cvtl y)]) +cvtpair (PatG x,y) = noLoc (GRHS (cvtstmts x ++ [nlResultStmt (cvtl y)])) cvtOverLit :: Lit -> HsOverLit cvtOverLit (IntegerL i) = mkHsIntegral i @@ -267,59 +290,67 @@ cvtLit :: Lit -> HsLit cvtLit (IntPrimL i) = HsIntPrim i cvtLit (FloatPrimL f) = HsFloatPrim f cvtLit (DoublePrimL f) = HsDoublePrim f -cvtLit (CharL c) = HsChar (ord c) +cvtLit (CharL c) = HsChar c cvtLit (StringL s) = HsString (mkFastString s) -cvtp :: Meta.Pat -> Hs.Pat RdrName -cvtp (Meta.LitP l) +cvtlp :: TH.Pat -> Hs.LPat RdrName +cvtlp pat = noLoc (cvtp pat) + +cvtp :: TH.Pat -> Hs.Pat RdrName +cvtp (TH.LitP l) | overloadedLit l = NPatIn (cvtOverLit l) Nothing -- Not right for negative -- patterns; need to think -- about that! | otherwise = Hs.LitPat (cvtLit l) -cvtp (Meta.VarP s) = Hs.VarPat(vName s) +cvtp (TH.VarP s) = Hs.VarPat(vName s) cvtp (TupP [p]) = cvtp p -cvtp (TupP ps) = TuplePat (map cvtp ps) Boxed -cvtp (ConP s ps) = ConPatIn (cName s) (PrefixCon (map cvtp ps)) -cvtp (TildeP p) = LazyPat (cvtp p) -cvtp (Meta.AsP s p) = AsPat (vName s) (cvtp p) -cvtp Meta.WildP = WildPat void -cvtp (RecP c fs) = ConPatIn (cName c) $ Hs.RecCon (map (\(s,p) -> (vName s,cvtp p)) fs) -cvtp (ListP ps) = ListPat (map cvtp ps) void +cvtp (TupP ps) = TuplePat (map cvtlp ps) Boxed +cvtp (ConP s ps) = ConPatIn (noLoc (cName s)) (PrefixCon (map cvtlp ps)) +cvtp (InfixP p1 s p2) + = ConPatIn (noLoc (cName s)) (InfixCon (cvtlp p1) (cvtlp p2)) +cvtp (TildeP p) = LazyPat (cvtlp p) +cvtp (TH.AsP s p) = AsPat (noLoc (vName s)) (cvtlp p) +cvtp TH.WildP = WildPat void +cvtp (RecP c fs) = ConPatIn (noLoc (cName c)) $ Hs.RecCon (map (\(s,p) -> (noLoc (vName s),cvtlp p)) fs) +cvtp (ListP ps) = ListPat (map cvtlp ps) void +cvtp (SigP p t) = SigPatIn (cvtlp p) (cvtType t) ----------------------------------------------------------- -- Types and type variables -cvt_tvs :: [String] -> [HsTyVarBndr RdrName] -cvt_tvs tvs = map (UserTyVar . tName) tvs +cvt_tvs :: [TH.Name] -> [LHsTyVarBndr RdrName] +cvt_tvs tvs = map (noLoc . UserTyVar . tName) tvs -cvt_context :: Cxt -> HsContext RdrName -cvt_context tys = map cvt_pred tys +cvt_context :: Cxt -> LHsContext RdrName +cvt_context tys = noLoc (map (noLoc . cvt_pred) tys) -cvt_pred :: Meta.Type -> HsPred RdrName +cvt_pred :: TH.Type -> HsPred RdrName cvt_pred ty = case split_ty_app ty of (ConT tc, tys) -> HsClassP (tconName tc) (map cvtType tys) - other -> panic "Malformed predicate" + (VarT tv, tys) -> HsClassP (tName tv) (map cvtType tys) + other -> cvtPanic "Malformed predicate" (text (TH.pprint ty)) -cvtType :: Meta.Type -> HsType RdrName +convertToHsType = cvtType + +cvtType :: TH.Type -> LHsType RdrName cvtType ty = trans (root ty []) where root (AppT a b) zs = root a (cvtType b : zs) root t zs = (t,zs) trans (TupleT n,args) - | length args == n = HsTupleTy (HsTupCon Boxed n) args - | n == 0 = foldl HsAppTy (HsTyVar (tconName "()")) args - | otherwise = foldl HsAppTy (HsTyVar (tconName ("(" ++ replicate (n-1) ',' ++ ")"))) args - trans (ArrowT, [x,y]) = HsFunTy x y - trans (ListT, [x]) = HsListTy x + | length args == n = noLoc (HsTupleTy Boxed args) + | n == 0 = foldl nlHsAppTy (nlHsTyVar (getRdrName unitTyCon)) args + | otherwise = foldl nlHsAppTy (nlHsTyVar (getRdrName (tupleTyCon Boxed n))) args + trans (ArrowT, [x,y]) = nlHsFunTy x y + trans (ListT, [x]) = noLoc (HsListTy x) - trans (VarT nm, args) = foldl HsAppTy (HsTyVar (tName nm)) args - trans (ConT tc, args) = foldl HsAppTy (HsTyVar (tconName tc)) args + trans (VarT nm, args) = foldl nlHsAppTy (nlHsTyVar (tName nm)) args + trans (ConT tc, args) = foldl nlHsAppTy (nlHsTyVar (tconName tc)) args - trans (ForallT tvs cxt ty, []) = mkHsForAllTy (Just (cvt_tvs tvs)) - (cvt_context cxt) - (cvtType ty) + trans (ForallT tvs cxt ty, []) = noLoc $ mkExplicitHsForAllTy + (cvt_tvs tvs) (cvt_context cxt) (cvtType ty) -split_ty_app :: Meta.Type -> (Meta.Type, [Meta.Type]) +split_ty_app :: TH.Type -> (TH.Type, [TH.Type]) split_ty_app ty = go ty [] where go (AppT f a) as = go f (a:as) @@ -327,15 +358,20 @@ split_ty_app ty = go ty [] ----------------------------------------------------------- sigP :: Dec -> Bool -sigP (Meta.SigD _ _) = True +sigP (TH.SigD _ _) = True sigP other = False ----------------------------------------------------------- +cvtPanic :: String -> SDoc -> b +cvtPanic herald thing + = pprPanic herald (thing $$ ptext SLIT("When splicing generated code into the program")) + +----------------------------------------------------------- -- some useful things -truePat = ConPatIn (cName "True") (PrefixCon []) -falsePat = ConPatIn (cName "False") (PrefixCon []) +truePat = nlConPat (getRdrName trueDataCon) [] +falsePat = nlConPat (getRdrName falseDataCon) [] overloadedLit :: Lit -> Bool -- True for literals that Haskell treats as overloaded @@ -346,49 +382,64 @@ overloadedLit l = False void :: Type.Type void = placeHolderType -loc0 :: SrcLoc -loc0 = generatedSrcLoc +loc0 :: SrcSpan +loc0 = srcLocSpan generatedSrcLoc + +-------------------------------------------------------------------- +-- Turning Name back into RdrName +-------------------------------------------------------------------- -- variable names -vName :: String -> RdrName -vName = mkName varName +vName :: TH.Name -> RdrName +vName = thRdrName OccName.varName -- Constructor function names; this is Haskell source, hence srcDataName -cName :: String -> RdrName -cName = mkName srcDataName +cName :: TH.Name -> RdrName +cName = thRdrName OccName.srcDataName -- Type variable names -tName :: String -> RdrName -tName = mkName tvName +tName :: TH.Name -> RdrName +tName = thRdrName OccName.tvName -- Type Constructor names -tconName = mkName tcName +tconName = thRdrName OccName.tcName + +thRdrName :: OccName.NameSpace -> TH.Name -> RdrName +-- This turns a Name into a RdrName +-- The last case is slightly interesting. It constructs a +-- unique name from the unique in the TH thingy, so that the renamer +-- won't mess about. I hope. (Another possiblity would be to generate +-- "x_77" etc, but that could conceivably clash.) -mkName :: NameSpace -> String -> RdrName --- Parse the string to see if it has a "." or ":" in it --- so we know whether to generate a qualified or original name +thRdrName ns (TH.Name occ (TH.NameG ns' mod)) = mkOrig (mk_mod mod) (mk_occ ns occ) +thRdrName ns (TH.Name occ TH.NameS) = mkDynName ns occ +thRdrName ns (TH.Name occ (TH.NameU uniq)) = nameRdrName (mkInternalName (mk_uniq uniq) (mk_occ ns occ) noSrcLoc) + +mk_uniq :: Int# -> Unique +mk_uniq u = mkUniqueGrimily (I# u) + +-- The packing and unpacking is rather turgid :-( +mk_occ :: OccName.NameSpace -> TH.OccName -> OccName.OccName +mk_occ ns occ = OccName.mkOccFS ns (mkFastString (TH.occString occ)) + +mk_mod :: TH.ModName -> ModuleName +mk_mod mod = mkModuleName (TH.modString mod) + +mkDynName :: OccName.NameSpace -> TH.OccName -> RdrName +-- Parse the string to see if it has a "." in it +-- so we know whether to generate a qualified or unqualified name -- It's a bit tricky because we need to parse -- Foo.Baz.x as Qual Foo.Baz x -- So we parse it from back to front -mkName ns str - = split [] (reverse str) +mkDynName ns th_occ + = split [] (reverse (TH.occString th_occ)) where - split occ [] = mkRdrUnqual (mk_occ occ) - split occ (c:d:rev) -- 'd' is the last char before the separator - | is_sep c -- E.g. Fo.x d='o' - && isAlphaNum d -- Fo.+: d='+' perhaps - = mk_qual (reverse (d:rev)) c occ - split occ (c:rev) = split (c:occ) rev - - mk_qual mod '.' occ = mkRdrQual (mk_mod mod) (mk_occ occ) - mk_qual mod ':' occ = mkOrig (mk_mod mod) (mk_occ occ) + split occ [] = mkRdrUnqual (mk_occ occ) + split occ ('.':rev) = mkRdrQual (mk_mod (reverse rev)) (mk_occ occ) + split occ (c:rev) = split (c:occ) rev - mk_occ occ = mkOccFS ns (mkFastString occ) + mk_occ occ = OccName.mkOccFS ns (mkFastString occ) mk_mod mod = mkModuleName mod - - is_sep '.' = True - is_sep ':' = True - is_sep other = False \end{code}