X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2FhsSyn%2FConvert.lhs;h=8b64c981d9a3f5f17fc289ca24caa91b6912e4a3;hb=9d0c8f842e35dde3d570580cf62a32779f66a6de;hp=60080ee5b00853412edf92d51b899d826492962b;hpb=283e858564bb7979e59dcf00e852c2039aff231c;p=ghc-hetmet.git diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs index 60080ee..8b64c98 100644 --- a/compiler/hsSyn/Convert.lhs +++ b/compiler/hsSyn/Convert.lhs @@ -83,8 +83,8 @@ instance Monad CvtM where initCvt :: SrcSpan -> CvtM a -> Either Message a initCvt loc (CvtM m) = m loc -force :: a -> CvtM a -force a = a `seq` return a +force :: a -> CvtM () +force a = a `seq` return () failWith :: Message -> CvtM a failWith m = CvtM (\_ -> Left full_msg) @@ -115,36 +115,42 @@ cvtTop (TH.SigD nm typ) ; returnL $ Hs.SigD (TypeSig nm' ty') } cvtTop (TySynD tc tvs rhs) - = do { (_, tc', tvs', _) <- cvt_tycl_hdr [] tc 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 ; 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 $ mkClassDecl (cxt', tc', tvs') fds' sigs' binds' ats'' [] + TyClD $ ClassDecl { tcdCtxt = cxt', tcdLName = tc', tcdTyVars = tvs' + , tcdFDs = fds', tcdSigs = sigs', tcdMeths = binds' + , tcdATs = ats'', tcdDocs = [] } -- no docs in TH ^^ } where - isFamilyD (FamilyD _ _ _) = True - isFamilyD _ = False + isFamilyD (FamilyD _ _ _ _) = True + isFamilyD _ = False cvtTop (InstanceD ctxt ty decs) = do { let (ats, bind_sig_decs) = partition isFamInstD decs @@ -173,27 +179,31 @@ cvtTop (PragmaD prag) ; returnL $ Hs.SigD prag' } -cvtTop (FamilyD flav tc tvs) - = do { (_, tc', tvs', _) <- cvt_tycl_hdr [] tc tvs - ; returnL $ TyClD (TyFamily (cvtFamFlavour flav) tc' tvs' Nothing) - -- FIXME: kinds +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 { stuff <- cvt_tyinst_hdr ctxt tc tys + = do { (ctxt', tc', tvs', typats') <- cvt_tyinst_hdr ctxt tc tys ; 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 = typats', tcdKindSig = Nothing + , tcdCons = cons', tcdDerivs = derivs' }) } cvtTop (NewtypeInstD ctxt tc tys constr derivs) - = do { stuff <- cvt_tyinst_hdr ctxt tc tys + = do { (ctxt', tc', tvs', typats') <- cvt_tyinst_hdr ctxt tc tys ; 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 = typats', tcdKindSig = Nothing + , tcdCons = [con'], tcdDerivs = derivs' }) } cvtTop (TySynInstD tc tys rhs) @@ -207,16 +217,15 @@ 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.Name] +cvt_tycl_hdr :: TH.Cxt -> TH.Name -> [TH.TyVarBndr] -> CvtM ( LHsContext RdrName , Located RdrName - , [LHsTyVarBndr RdrName] - , Maybe [LHsType RdrName]) + , [LHsTyVarBndr RdrName]) cvt_tycl_hdr cxt tc tvs = do { cxt' <- cvtContext cxt ; tc' <- tconNameL tc ; tvs' <- cvtTvs tvs - ; return (cxt', tc', tvs', Nothing) + ; return (cxt', tc', tvs') } cvt_tyinst_hdr :: TH.Cxt -> TH.Name -> [TH.Type] @@ -235,7 +244,7 @@ cvt_tyinst_hdr cxt tc tys where collect (ForallT _ _ _) = failWith $ text "Forall type not allowed as type parameter" - collect (VarT tv) = return [tv] + collect (VarT tv) = return [PlainTV tv] collect (ConT _) = return [] collect (TupleT _) = return [] collect ArrowT = return [] @@ -245,6 +254,8 @@ cvt_tyinst_hdr cxt tc tys ; tvs2 <- collect t2 ; return $ tvs1 ++ tvs2 } + collect (SigT (VarT tv) ki) = return [KindedTV tv ki] + collect (SigT ty _) = collect ty --------------------------------------------------- -- Data types @@ -257,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') @@ -280,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) @@ -317,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 @@ -347,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 @@ -506,7 +532,10 @@ cvtl e = wrapL (cvt e) 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' } @@ -595,6 +624,21 @@ 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 } @@ -628,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 @@ -643,11 +688,18 @@ 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' } +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' } @@ -674,27 +726,42 @@ cvtPredTy ty 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') - | 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' } - _ -> 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 @@ -706,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) + ----------------------------------------------------------- @@ -746,9 +817,10 @@ tconName n = cvtName OccName.tcClsName n cvtName :: OccName.NameSpace -> TH.Name -> CvtM RdrName cvtName ctxt_ns (TH.Name occ flavour) | not (okOcc ctxt_ns occ_str) = failWith (badOcc ctxt_ns occ_str) - | otherwise = force (thRdrName ctxt_ns occ_str flavour) + | otherwise = force rdr_name >> return rdr_name where occ_str = TH.occString occ + rdr_name = thRdrName ctxt_ns occ_str flavour okOcc :: OccName.NameSpace -> String -> Bool okOcc _ [] = False @@ -846,7 +918,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