X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDesugar.lhs;h=5fb4ebb5eb6d08eb8022112ea726a5de26fe9a1e;hb=163d12852002a67c5b661b4b3e7e3c5bb6faa5f3;hp=7d0be3f65b507d7b720c82be7a79a7d73ace6e49;hpb=34c8d0312071f7d0f4d221a997d3408c653ef9e5;p=ghc-hetmet.git diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs index 7d0be3f..5fb4ebb 100644 --- a/compiler/deSugar/Desugar.lhs +++ b/compiler/deSugar/Desugar.lhs @@ -8,7 +8,6 @@ The Desugarer: turning HsSyn into Core. \begin{code} module Desugar ( deSugar, deSugarExpr ) where -import TysWiredIn (unitDataConId) import DynFlags import StaticFlags import HscTypes @@ -19,6 +18,7 @@ import Id import Name import CoreSyn import CoreSubst +import CoqPass ( coqPassCoreToString, coqPassCoreToCore ) import PprCore import DsMonad import DsExpr @@ -41,8 +41,8 @@ import MonadUtils import OrdList import Data.List import Data.IORef -import DsHetMet -import Control.Exception ( catch, ErrorCall, Exception(..) ) +import PrelNames +import UniqSupply \end{code} %************************************************************************ @@ -72,12 +72,13 @@ deSugar hsc_env tcg_anns = anns, tcg_binds = binds, tcg_imp_specs = imp_specs, - tcg_ev_binds = ev_binds, - tcg_fords = fords, - tcg_rules = rules, - tcg_insts = insts, - tcg_fam_insts = fam_insts, - tcg_hpc = other_hpc_info }) + tcg_ev_binds = ev_binds, + tcg_fords = fords, + tcg_rules = rules, + tcg_vects = vects, + tcg_insts = insts, + tcg_fam_insts = fam_insts, + tcg_hpc = other_hpc_info }) = do { let dflags = hsc_dflags hsc_env ; showPass dflags "Desugar" @@ -91,7 +92,7 @@ deSugar hsc_env <- case target of HscNothing -> return (emptyMessages, - Just ([], nilOL, [], NoStubs, hpcInfo, emptyModBreaks)) + Just ([], nilOL, [], [], NoStubs, hpcInfo, emptyModBreaks, undefined, undefined)) _ -> do (binds_cvr,ds_hpc_info, modBreaks) <- if (opt_Hpc @@ -101,19 +102,22 @@ deSugar hsc_env (typeEnvTyCons type_env) binds else return (binds, hpcInfo, emptyModBreaks) initDs hsc_env mod rdr_env type_env $ do - do { ds_ev_binds <- dsEvBinds ev_binds - ; core_prs <- dsTopLHsBinds auto_scc binds_cvr + do { ds_ev_binds <- dsEvBinds ev_binds + ; core_prs <- dsTopLHsBinds auto_scc binds_cvr ; (spec_prs, spec_rules) <- dsImpSpecs imp_specs - ; (ds_fords, foreign_prs) <- dsForeigns fords - ; rules <- mapMaybeM dsRule rules - ; return ( ds_ev_binds + ; (ds_fords, foreign_prs) <- dsForeigns fords + ; ds_rules <- mapMaybeM dsRule rules + ; ds_vects <- mapM dsVect vects + ; hetmet_brak <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_brak_name else return undefined + ; hetmet_esc <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_esc_name else return undefined + ; return ( ds_ev_binds , foreign_prs `appOL` core_prs `appOL` spec_prs - , spec_rules ++ rules - , ds_fords, ds_hpc_info, modBreaks) } + , spec_rules ++ ds_rules, ds_vects + , ds_fords, ds_hpc_info, modBreaks, hetmet_brak, hetmet_esc) } - ; case mb_res of { - Nothing -> return (msgs, Nothing) ; - Just (ds_ev_binds, all_prs, all_rules, ds_fords,ds_hpc_info, modBreaks) -> do + ; case mb_res of { + Nothing -> return (msgs, Nothing) ; + Just (ds_ev_binds, all_prs, all_rules, ds_vects, ds_fords,ds_hpc_info, modBreaks, hetmet_brak, hetmet_esc) -> do { -- Add export flags to bindings keep_alive <- readIORef keep_var @@ -137,26 +141,18 @@ deSugar hsc_env ; (ds_binds, ds_rules_for_imps) <- simpleOptPgm dflags final_pgm rules_for_imps -- The simpleOptPgm gets rid of type -- bindings plus any stupid dead code -{- - ; dumpIfSet_dyn dflags Opt_D_dump_proof "input to flattener" (text $ showSDoc $ pprCoreBindings ds_binds) - ; let uhandler (err::ErrorCall) - = dumpIfSet_dyn dflags Opt_D_dump_proof "System FC Proof" - (text $ "\\begin{verbatim}\n" ++ - show err ++ - "\\end{verbatim}\n\n") - in (dumpIfSet_dyn dflags Opt_D_dump_proof "System FC Proof" $ - (vcat (map (\ bind -> let e = case bind of - NonRec b e -> e - Rec lve -> Let (Rec lve) (Var unitDataConId) - in text $ "\\begin{verbatim}\n" ++ - (showSDoc $ pprCoreBindings ds_binds) ++ - "\\end{verbatim}\n\n" ++ - "$$\n"++ - (core2proofAndShow e) ++ - "$$\n" - ) ds_binds))) `Control.Exception.catch` uhandler --} - ; endPass dflags CoreDesugar ds_binds ds_rules_for_imps + + ; dumpIfSet_dyn dflags Opt_D_coqpass "Coq Pass Output" $ text $ coqPassCoreToString ds_binds + + ; ds_binds' <- if dopt Opt_F_coqpass dflags + then do { us <- mkSplitUniqSupply '~' + ; return $ coqPassCoreToCore hetmet_brak hetmet_esc us ds_binds + } + else return ds_binds + + ; dumpIfSet_dyn dflags Opt_D_dump_coqpass "After Coq Pass" (text $ showSDoc $ pprCoreBindings ds_binds') + + ; endPass dflags CoreDesugar ds_binds' ds_rules_for_imps ; let used_names = mkUsedNames tcg_env ; deps <- mkDependencies tcg_env @@ -178,10 +174,11 @@ deSugar hsc_env mg_inst_env = inst_env, mg_fam_inst_env = fam_inst_env, mg_rules = ds_rules_for_imps, - mg_binds = ds_binds, + mg_binds = ds_binds', mg_foreign = ds_fords, mg_hpc_info = ds_hpc_info, mg_modBreaks = modBreaks, + mg_vect_decls = ds_vects, mg_vect_info = noVectInfo } ; return (msgs, Just mod_guts) @@ -243,7 +240,7 @@ deSugarExpr :: HscEnv deSugarExpr hsc_env this_mod rdr_env type_env tc_expr = do let dflags = hsc_dflags hsc_env - showPass dflags "Desugarz" + showPass dflags "Desugar" -- Do desugaring (msgs, mb_core_expr) <- initDs hsc_env this_mod rdr_env type_env $ @@ -253,10 +250,8 @@ deSugarExpr hsc_env this_mod rdr_env type_env tc_expr = do Nothing -> return (msgs, Nothing) Just expr -> do -{- -- Dump output - dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (text $ "$$\n"++(core2proofAndShow expr)++"$$\n") --} + dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr expr) return (msgs, Just expr) \end{code} @@ -397,3 +392,26 @@ That keeps the desugaring of list comprehensions simple too. Nor do we want to warn of conversion identities on the LHS; the rule is precisly to optimise them: {-# RULES "fromRational/id" fromRational = id :: Rational -> Rational #-} + + +%************************************************************************ +%* * +%* Desugaring vectorisation declarations +%* * +%************************************************************************ + +\begin{code} +dsVect :: LVectDecl Id -> DsM CoreVect +dsVect (L loc (HsVect v rhs)) + = putSrcSpanDs loc $ + do { rhs' <- fmapMaybeM dsLExpr rhs + ; return $ Vect (unLoc v) rhs' + } +-- dsVect (L loc (HsVect v Nothing)) +-- = return $ Vect v Nothing +-- dsVect (L loc (HsVect v (Just rhs))) +-- = putSrcSpanDs loc $ +-- do { rhs' <- dsLExpr rhs +-- ; return $ Vect v (Just rhs') +-- } +\end{code}