X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FConvert.lhs;h=a0367457743e71cd9e6c0f0959aeee143f2be64b;hb=9b5fb22b3e84b58d7d17ae8f3158ee5841fe0eab;hp=bbe56ade5cd0959807e32ddeb276a6e49a0225de;hpb=dbc254c3dcd64761015a3d1c191ac742caafbf4c;p=ghc-hetmet.git diff --git a/ghc/compiler/hsSyn/Convert.lhs b/ghc/compiler/hsSyn/Convert.lhs index bbe56ad..a036745 100644 --- a/ghc/compiler/hsSyn/Convert.lhs +++ b/ghc/compiler/hsSyn/Convert.lhs @@ -14,68 +14,152 @@ import Language.Haskell.THSyntax as Meta import HsSyn as Hs ( HsExpr(..), HsLit(..), ArithSeqInfo(..), - HsStmtContext(..), + HsStmtContext(..), TyClDecl(..), Match(..), GRHSs(..), GRHS(..), HsPred(..), HsDecl(..), TyClDecl(..), InstDecl(..), ConDecl(..), Stmt(..), HsBinds(..), MonoBinds(..), Sig(..), Pat(..), HsConDetails(..), HsOverLit, BangType(..), placeHolderType, HsType(..), HsTupCon(..), HsTyVarBndr(..), HsContext, - mkSimpleMatch + mkSimpleMatch, mkHsForAllTy ) import RdrName ( RdrName, mkRdrUnqual, mkRdrQual, mkOrig ) import Module ( mkModuleName ) -import RdrHsSyn ( mkHsIntegral, mkClassDecl, mkTyData ) +import RdrHsSyn ( mkHsIntegral, mkHsFractional, mkClassDecl, mkTyData ) import OccName import SrcLoc ( SrcLoc, generatedSrcLoc ) import TyCon ( DataConDetails(..) ) import Type ( Type ) import BasicTypes( Boxity(..), RecFlag(Recursive), NewOrData(..), StrictnessMark(..) ) -import FastString( mkFastString ) -import Char ( ord, isAlphaNum ) +import ForeignCall ( Safety(..), CCallConv(..), CCallTarget(..) ) +import HsDecls ( CImportSpec(..), ForeignImport(..), ForeignDecl(..) ) +import FastString( FastString, mkFastString, nilFS ) +import Char ( ord, isAscii, isAlphaNum, isAlpha ) import List ( partition ) +import ErrUtils (Message) import Outputable ------------------------------------------------------------------- -convertToHsDecls :: [Meta.Dec] -> [HsDecl RdrName] -convertToHsDecls ds - = ValD (cvtdecs binds_and_sigs) : map cvt_top top_decls +convertToHsDecls :: [Meta.Dec] -> [Either (HsDecl RdrName) Message] +convertToHsDecls ds = map cvt_top ds + +mk_con con = case con of + NormalCon c strtys + -> ConDecl (cName c) noExistentials noContext + (PrefixCon (map mk_arg strtys)) loc0 + Meta.RecCon c varstrtys + -> ConDecl (cName c) noExistentials noContext + (Hs.RecCon (map mk_id_arg varstrtys)) loc0 + Meta.InfixCon st1 c st2 + -> ConDecl (cName c) noExistentials noContext + (Hs.InfixCon (mk_arg st1) (mk_arg st2)) loc0 where - (binds_and_sigs, top_decls) = partition sigOrBindP ds - -cvt_top (Data tc tvs constrs derivs) - = TyClD (mkTyData DataType - (noContext, tconName tc, cvt_tvs tvs) - (DataCons (map mk_con constrs)) - (mk_derivs derivs) loc0) - where - mk_con (Constr c tys) - = ConDecl (cName c) noExistentials noContext - (PrefixCon (map mk_arg tys)) loc0 - - mk_arg ty = BangType NotMarkedStrict (cvtType ty) - - mk_derivs [] = Nothing - mk_derivs cs = Just [HsClassP (tconName c) [] | c <- cs] - -cvt_top (Class ctxt cl tvs decs) - = TyClD (mkClassDecl (cvt_context ctxt, tconName cl, cvt_tvs tvs) - noFunDeps - sigs (Just binds) loc0) + mk_arg (IsStrict, ty) = BangType MarkedUserStrict (cvtType ty) + mk_arg (NotStrict, ty) = BangType NotMarkedStrict (cvtType ty) + + mk_id_arg (i, IsStrict, ty) + = (vName i, BangType MarkedUserStrict (cvtType ty)) + mk_id_arg (i, NotStrict, ty) + = (vName i, BangType NotMarkedStrict (cvtType ty)) + +mk_derivs [] = Nothing +mk_derivs cs = Just [HsClassP (tconName c) [] | c <- cs] + +cvt_top :: Meta.Dec -> Either (HsDecl RdrName) Message +cvt_top d@(ValDec _ _ _) = Left $ ValD (cvtd d) +cvt_top d@(FunDec _ _) = Left $ ValD (cvtd d) + +cvt_top (TySynDec tc tvs rhs) + = Left $ TyClD (TySynonym (tconName tc) (cvt_tvs tvs) (cvtType rhs) loc0) + +cvt_top (DataDec 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) + +cvt_top (NewtypeDec 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 (ClassDec ctxt cl tvs decs) + = Left $ TyClD (mkClassDecl (cvt_context ctxt, tconName cl, cvt_tvs tvs) + noFunDeps sigs + (Just binds) loc0) where (binds,sigs) = cvtBindsAndSigs decs -cvt_top (Instance tys ty decs) - = InstD (InstDecl inst_ty binds sigs Nothing loc0) +cvt_top (InstanceDec tys ty decs) + = Left $ InstD (InstDecl inst_ty binds sigs Nothing loc0) where (binds, sigs) = cvtBindsAndSigs decs inst_ty = HsForAllTy Nothing (cvt_context tys) (HsPredTy (cvt_pred ty)) +cvt_top (SigDec nm typ) = Left $ SigD (Sig (vName nm) (cvtType typ) loc0) + +cvt_top (ForeignDec (ImportForeign 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) + Nothing -> Right $ text (show from) + <+> ptext SLIT("is not a valid ccall impent") + where callconv' = case callconv of + CCall -> CCallConv + StdCall -> StdCallConv + safety' = case safety of + Unsafe -> PlayRisky + Safe -> PlaySafe False + Threadsafe -> PlaySafe True + parsed = parse_ccall_impent nm from + +parse_ccall_impent :: String -> String -> Maybe (FastString, CImportSpec) +parse_ccall_impent nm s + = case lex_ccall_impent s of + Just ["dynamic"] -> Just (nilFS, CFunction DynamicTarget) + Just ["wrapper"] -> Just (nilFS, CWrapper) + Just ("static":ts) -> parse_ccall_impent_static nm ts + Just ts -> parse_ccall_impent_static nm ts + Nothing -> Nothing + +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 + where is_cid :: String -> Bool + is_cid x = all (/= '.') x && (isAlpha (head x) || head x == '_') + mk_cid :: String -> CImportSpec + mk_cid = CFunction . StaticTarget . mkFastString + +lex_ccall_impent :: String -> Maybe [String] +lex_ccall_impent "" = Just [] +lex_ccall_impent ('&':xs) = fmap ("&":) $ lex_ccall_impent xs +lex_ccall_impent (' ':xs) = lex_ccall_impent xs +lex_ccall_impent ('\t':xs) = lex_ccall_impent xs +lex_ccall_impent xs = case span is_valid xs of + ("", _) -> Nothing + (t, xs') -> fmap (t:) $ lex_ccall_impent xs' + where is_valid :: Char -> Bool + is_valid c = isAscii c && (isAlphaNum c || c `elem` "._") + noContext = [] noExistentials = [] noFunDeps = [] @@ -84,27 +168,31 @@ noFunDeps = [] convertToHsExpr :: Meta.Exp -> HsExpr RdrName convertToHsExpr = cvt -cvt (Var s) = HsVar(vName s) -cvt (Con s) = HsVar(cName s) -cvt (Lit l) +cvt (VarExp s) = HsVar (vName s) +cvt (ConExp s) = HsVar (cName s) +cvt (LitExp l) | overloadedLit l = HsOverLit (cvtOverLit l) | otherwise = HsLit (cvtLit l) -cvt (App x y) = HsApp (cvt x) (cvt y) -cvt (Lam ps e) = HsLam (mkSimpleMatch (map cvtp ps) (cvt e) void loc0) -cvt (Tup es) = ExplicitTuple(map cvt es) Boxed -cvt (Cond x y z) = HsIf (cvt x) (cvt y) (cvt z) loc0 -cvt (Let ds e) = HsLet (cvtdecs ds) (cvt e) -cvt (Case e ms) = HsCase (cvt e) (map cvtm ms) loc0 -cvt (Do ss) = HsDo DoExpr (cvtstmts ss) [] void loc0 -cvt (Comp ss) = HsDo ListComp (cvtstmts ss) [] void loc0 -cvt (ArithSeq dd) = ArithSeqIn (cvtdd dd) +cvt (AppExp x y) = HsApp (cvt x) (cvt y) +cvt (LamExp ps e) = HsLam (mkSimpleMatch (map cvtp ps) (cvt e) void loc0) +cvt (TupExp [e]) = cvt e +cvt (TupExp es) = ExplicitTuple(map cvt es) Boxed +cvt (CondExp x y z) = HsIf (cvt x) (cvt y) (cvt z) loc0 +cvt (LetExp ds e) = HsLet (cvtdecs ds) (cvt e) +cvt (CaseExp e ms) = HsCase (cvt e) (map cvtm ms) loc0 +cvt (DoExp ss) = HsDo DoExpr (cvtstmts ss) [] void loc0 +cvt (CompExp ss) = HsDo ListComp (cvtstmts ss) [] void loc0 +cvt (ArithSeqExp dd) = ArithSeqIn (cvtdd dd) cvt (ListExp xs) = ExplicitList void (map cvt xs) -cvt (Infix (Just x) s (Just y)) = OpApp (cvt x) (HsVar(vName s)) undefined (cvt y) -cvt (Infix Nothing s (Just y)) = SectionR (HsVar(vName s)) (cvt y) -cvt (Infix (Just x) s Nothing ) = SectionL (cvt x) (HsVar(vName s)) -cvt (Infix Nothing s Nothing ) = HsVar(vName s) -- Can I indicate this is an infix thing? - +cvt (InfixExp (Just x) s (Just y)) + = HsPar (OpApp (cvt x) (cvt s) undefined (cvt y)) +cvt (InfixExp Nothing s (Just y)) = SectionR (cvt s) (cvt y) +cvt (InfixExp (Just x) s Nothing ) = SectionL (cvt x) (cvt s) +cvt (InfixExp Nothing s Nothing ) = cvt s -- Can I indicate this is an infix thing? +cvt (SigExp e t) = ExprWithTySig (cvt e) (cvtType t) +cvt (RecConExp c flds) = RecordCon (cName c) (map (\(x,y) -> (vName x, cvt y)) flds) +cvt (RecUpdExp e flds) = RecordUpd (cvt e) (map (\(x,y) -> (vName x, cvt y)) flds) cvtdecs :: [Meta.Dec] -> HsBinds RdrName cvtdecs [] = EmptyBinds @@ -117,7 +205,7 @@ cvtBindsAndSigs ds where (sigs, non_sigs) = partition sigP ds -cvtSig (Proto nm typ) = Sig (vName nm) (cvtType typ) loc0 +cvtSig (SigDec nm typ) = Sig (vName nm) (cvtType typ) loc0 cvtds :: [Meta.Dec] -> MonoBinds RdrName cvtds [] = EmptyMonoBinds @@ -126,69 +214,76 @@ cvtds (d:ds) = AndMonoBinds (cvtd d) (cvtds ds) cvtd :: Meta.Dec -> MonoBinds RdrName -- Used only for declarations in a 'let/where' clause, -- not for top level decls -cvtd (Val (Pvar s) body ds) = FunMonoBind (vName s) False - (panic "what now?") loc0 -cvtd (Fun nm cls) = FunMonoBind (vName nm) False (map cvtclause cls) loc0 -cvtd (Val p body ds) = PatMonoBind (cvtp p) (GRHSs (cvtguard body) +cvtd (ValDec (Meta.VarPat s) body ds) = FunMonoBind (vName s) False + [cvtclause (Clause [] body ds)] loc0 +cvtd (FunDec nm cls) = FunMonoBind (vName nm) False (map cvtclause cls) loc0 +cvtd (ValDec p body ds) = PatMonoBind (cvtp p) (GRHSs (cvtguard body) (cvtdecs ds) void) loc0 cvtd x = panic "Illegal kind of declaration in where clause" -cvtclause :: Meta.Clause (Meta.Pat) (Meta.Exp) (Meta.Dec) -> Hs.Match RdrName -cvtclause (ps,body,wheres) = Match (map cvtp ps) Nothing - (GRHSs (cvtguard body) (cvtdecs wheres) void) +cvtclause :: Meta.Clause -> Hs.Match RdrName +cvtclause (Clause ps body wheres) + = Hs.Match (map cvtp ps) Nothing (GRHSs (cvtguard body) (cvtdecs wheres) void) -cvtdd :: Meta.DDt -> ArithSeqInfo RdrName -cvtdd (Meta.From x) = (Hs.From (cvt x)) -cvtdd (Meta.FromThen x y) = (Hs.FromThen (cvt x) (cvt y)) -cvtdd (Meta.FromTo x y) = (Hs.FromTo (cvt x) (cvt y)) -cvtdd (Meta.FromThenTo x y z) = (Hs.FromThenTo (cvt x) (cvt y) (cvt z)) +cvtdd :: Meta.DotDot -> ArithSeqInfo RdrName +cvtdd (FromDotDot x) = (Hs.From (cvt x)) +cvtdd (FromThenDotDot x y) = (Hs.FromThen (cvt x) (cvt y)) +cvtdd (FromToDotDot x y) = (Hs.FromTo (cvt x) (cvt y)) +cvtdd (FromThenToDotDot x y z) = (Hs.FromThenTo (cvt x) (cvt y) (cvt z)) -cvtstmts :: [Meta.Stm] -> [Hs.Stmt RdrName] +cvtstmts :: [Meta.Stmt] -> [Hs.Stmt RdrName] cvtstmts [] = [] -- this is probably an error as every [stmt] should end with ResultStmt -cvtstmts [NoBindSt e] = [ResultStmt (cvt e) loc0] -- when its the last element use ResultStmt -cvtstmts (NoBindSt e : ss) = ExprStmt (cvt e) void loc0 : cvtstmts ss -cvtstmts (BindSt p e : ss) = BindStmt (cvtp p) (cvt e) loc0 : cvtstmts ss -cvtstmts (LetSt ds : ss) = LetStmt (cvtdecs ds) : cvtstmts ss -cvtstmts (ParSt dss : ss) = ParStmt(map cvtstmts dss) : cvtstmts ss +cvtstmts [NoBindStmt e] = [ResultStmt (cvt e) loc0] -- when its the last element use ResultStmt +cvtstmts (NoBindStmt e : ss) = ExprStmt (cvt e) void loc0 : cvtstmts ss +cvtstmts (Meta.BindStmt p e : ss) = Hs.BindStmt (cvtp p) (cvt e) loc0 : cvtstmts ss +cvtstmts (Meta.LetStmt ds : ss) = Hs.LetStmt (cvtdecs ds) : cvtstmts ss +cvtstmts (Meta.ParStmt dss : ss) = Hs.ParStmt(map cvtstmts dss) : cvtstmts ss -cvtm :: Meta.Mat -> Hs.Match RdrName -cvtm (p,body,wheres) = Match [cvtp p] Nothing - (GRHSs (cvtguard body) (cvtdecs wheres) void) +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.Rhs -> [GRHS RdrName] -cvtguard (Guarded pairs) = map cvtpair pairs -cvtguard (Normal e) = [GRHS [ ResultStmt (cvt e) loc0 ] loc0] +cvtguard :: Meta.RHS -> [GRHS RdrName] +cvtguard (GuardedRHS pairs) = map cvtpair pairs +cvtguard (NormalRHS e) = [GRHS [ ResultStmt (cvt e) loc0 ] loc0] cvtpair :: (Meta.Exp,Meta.Exp) -> GRHS RdrName -cvtpair (x,y) = GRHS [BindStmt truePat (cvt x) loc0, +cvtpair (x,y) = GRHS [Hs.BindStmt truePat (cvt x) loc0, ResultStmt (cvt y) loc0] loc0 cvtOverLit :: Lit -> HsOverLit -cvtOverLit (Int i) = mkHsIntegral (fromInt i) --- An Int is like an an (overloaded) '3' in a Haskell source program +cvtOverLit (IntegerLit i) = mkHsIntegral i +cvtOverLit (RationalLit r) = mkHsFractional r +-- An Integer is like an an (overloaded) '3' in a Haskell source program +-- Similarly 3.5 for fractionals cvtLit :: Lit -> HsLit -cvtLit (Char c) = HsChar (ord c) -cvtLit (CrossStage s) = error "What do we do about crossStage constants?" +cvtLit (IntPrimLit i) = HsIntPrim i +cvtLit (FloatPrimLit f) = HsFloatPrim f +cvtLit (DoublePrimLit f) = HsDoublePrim f +cvtLit (CharLit c) = HsChar (ord c) +cvtLit (StringLit s) = HsString (mkFastString s) cvtp :: Meta.Pat -> Hs.Pat RdrName -cvtp (Plit l) +cvtp (Meta.LitPat l) | overloadedLit l = NPatIn (cvtOverLit l) Nothing -- Not right for negative -- patterns; need to think -- about that! - | otherwise = LitPat (cvtLit l) -cvtp (Pvar s) = VarPat(vName s) -cvtp (Ptup ps) = TuplePat (map cvtp ps) Boxed -cvtp (Pcon s ps) = ConPatIn (cName s) (PrefixCon (map cvtp ps)) -cvtp (Ptilde p) = LazyPat (cvtp p) -cvtp (Paspat s p) = AsPat (vName s) (cvtp p) -cvtp Pwild = WildPat void + | otherwise = Hs.LitPat (cvtLit l) +cvtp (Meta.VarPat s) = Hs.VarPat(vName s) +cvtp (TupPat [p]) = cvtp p +cvtp (TupPat ps) = TuplePat (map cvtp ps) Boxed +cvtp (ConPat s ps) = ConPatIn (cName s) (PrefixCon (map cvtp ps)) +cvtp (TildePat p) = LazyPat (cvtp p) +cvtp (Meta.AsPat s p) = Hs.AsPat (vName s) (cvtp p) +cvtp Meta.WildPat = Hs.WildPat void +cvtp (RecPat c fs) = ConPatIn (cName c) $ Hs.RecCon (map (\(s,p) -> (vName s,cvtp p)) fs) ----------------------------------------------------------- -- Types and type variables @@ -196,42 +291,48 @@ cvtp Pwild = WildPat void cvt_tvs :: [String] -> [HsTyVarBndr RdrName] cvt_tvs tvs = map (UserTyVar . tName) tvs -cvt_context :: Context -> HsContext RdrName +cvt_context :: Cxt -> HsContext RdrName cvt_context tys = map cvt_pred tys cvt_pred :: Typ -> HsPred RdrName cvt_pred ty = case split_ty_app ty of - (Tvar tc, tys) -> HsClassP (tconName tc) (map cvtType tys) + (ConTyp (ConNameTag tc), tys) -> HsClassP (tconName tc) (map cvtType tys) other -> panic "Malformed predicate" cvtType :: Meta.Typ -> HsType RdrName -cvtType (Tvar nm) = HsTyVar(tName nm) -cvtType (Tapp x y) = trans (root x [y]) - where root (Tapp a b) zs = root a (b:zs) - root t zs = (t,zs) - trans (Tcon (Tuple n),args) = HsTupleTy (HsTupCon Boxed n) (map cvtType args) - trans (Tcon Arrow,[x,y]) = HsFunTy (cvtType x) (cvtType y) - trans (Tcon List,[x]) = HsListTy (cvtType x) - trans (Tcon (Name nm),args) = HsTyVar(tconName nm) - trans (t,args) = panic "bad type application" +cvtType ty = trans (root ty []) + where root (AppTyp a b) zs = root a (cvtType b : zs) + root t zs = (t,zs) + + trans (ConTyp (TupleTag n),args) | length args == n + = HsTupleTy (HsTupCon Boxed n) args + trans (ConTyp ArrowTag, [x,y]) = HsFunTy x y + trans (ConTyp ListTag, [x]) = HsListTy x + + trans (VarTyp nm, args) = foldl HsAppTy (HsTyVar (tName nm)) args + trans (ConTyp tc, args) = foldl HsAppTy (HsTyVar (tc_name tc)) args + + trans (ForallTyp tvs cxt ty, []) = mkHsForAllTy (Just (cvt_tvs tvs)) + (cvt_context cxt) + (cvtType ty) + + tc_name (ConNameTag nm) = tconName nm + tc_name ArrowTag = tconName "->" + tc_name ListTag = tconName "[]" + tc_name (TupleTag 0) = tconName "()" + tc_name (TupleTag n) = tconName ("(" ++ replicate (n-1) ',' ++ ")") split_ty_app :: Typ -> (Typ, [Typ]) split_ty_app ty = go ty [] where - go (Tapp f a) as = go f (a:as) + go (AppTyp f a) as = go f (a:as) go f as = (f,as) ----------------------------------------------------------- sigP :: Dec -> Bool -sigP (Proto _ _) = True +sigP (SigDec _ _) = True sigP other = False -sigOrBindP :: Dec -> Bool -sigOrBindP (Proto _ _) = True -sigOrBindP (Val _ _ _) = True -sigOrBindP (Fun _ _) = True -sigOrBindP other = False - ----------------------------------------------------------- -- some useful things @@ -241,8 +342,9 @@ falsePat = ConPatIn (cName "False") (PrefixCon []) overloadedLit :: Lit -> Bool -- True for literals that Haskell treats as overloaded -overloadedLit (Int l) = True -overloadedLit l = False +overloadedLit (IntegerLit l) = True +overloadedLit (RationalLit l) = True +overloadedLit l = False void :: Type.Type void = placeHolderType @@ -250,16 +352,13 @@ void = placeHolderType loc0 :: SrcLoc loc0 = generatedSrcLoc -fromInt :: Int -> Integer -fromInt x = toInteger x - -- variable names vName :: String -> RdrName vName = mkName varName --- Constructor function names +-- Constructor function names; this is Haskell source, hence srcDataName cName :: String -> RdrName -cName = mkName dataName +cName = mkName srcDataName -- Type variable names tName :: String -> RdrName @@ -295,3 +394,4 @@ mkName ns str is_sep ':' = True is_sep other = False \end{code} +