X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FdeSugar%2FDesugar.lhs;h=16e690f567da2c3a92138b82a8f53146ea729d35;hp=374c13b6260cb952872408cf0f9a0834a2ca0699;hb=c5b178be60a5a44abd2f4ddf8c399857678326e2;hpb=095c02ee7fbadae65d65a78f558147365190c636 diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs index 374c13b..16e690f 100644 --- a/compiler/deSugar/Desugar.lhs +++ b/compiler/deSugar/Desugar.lhs @@ -14,8 +14,12 @@ import HscTypes import HsSyn import TcRnTypes import MkIface +import IfaceEnv import Id +import IOEnv +import Pair import Name +import FastString import CoreSyn import CoreSubst import CoqPass ( coqPassCoreToString, coqPassCoreToCore ) @@ -31,7 +35,8 @@ import RdrName import NameSet import NameEnv import Rules -import CoreMonad ( endPass, CoreToDo(..) ) +import CoreMonad ( endPass, CoreToDo(..), CoreM, runCoreM, lookupOrigCoreM ) +import TyCon import ErrUtils import Outputable import SrcLoc @@ -97,32 +102,7 @@ deSugar hsc_env <- case target of HscNothing -> return (emptyMessages, - Just ([], nilOL, [], [], NoStubs, hpcInfo, emptyModBreaks, undefined, undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - , undefined - )) + Just ([], nilOL, [], [], NoStubs, hpcInfo, emptyModBreaks)) _ -> do (binds_cvr,ds_hpc_info, modBreaks) <- if (opt_Hpc @@ -131,6 +111,7 @@ deSugar hsc_env then addCoverageTicksToBinds dflags mod mod_loc (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 @@ -138,32 +119,6 @@ deSugar hsc_env ; (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 - ; hetmet_flatten <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_flatten_name else return undefined - ; hetmet_unflatten <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_unflatten_name else return undefined - ; hetmet_flattened_id <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_flattened_id_name else return undefined - ; hetmet_PGArrow <- if dopt Opt_F_coqpass dflags then dsLookupTyCon hetmet_PGArrow_name else return undefined - ; hetmet_PGArrow_unit <- if dopt Opt_F_coqpass dflags then dsLookupTyCon hetmet_PGArrow_unit_name else return undefined - ; hetmet_PGArrow_tensor <- if dopt Opt_F_coqpass dflags then dsLookupTyCon hetmet_PGArrow_tensor_name else return undefined - ; hetmet_PGArrow_exponent <- if dopt Opt_F_coqpass dflags then dsLookupTyCon hetmet_PGArrow_exponent_name else return undefined - ; hetmet_pga_id <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_id_name else return undefined - ; hetmet_pga_comp <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_comp_name else return undefined - ; hetmet_pga_first <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_first_name else return undefined - ; hetmet_pga_second <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_second_name else return undefined - ; hetmet_pga_cancell <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_cancell_name else return undefined - ; hetmet_pga_cancelr <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_cancelr_name else return undefined - ; hetmet_pga_uncancell <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_uncancell_name else return undefined - ; hetmet_pga_uncancelr <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_uncancelr_name else return undefined - ; hetmet_pga_assoc <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_assoc_name else return undefined - ; hetmet_pga_unassoc <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_unassoc_name else return undefined - ; hetmet_pga_copy <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_copy_name else return undefined - ; hetmet_pga_drop <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_drop_name else return undefined - ; hetmet_pga_swap <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_swap_name else return undefined - ; hetmet_pga_applyl <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_applyl_name else return undefined - ; hetmet_pga_applyr <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_applyr_name else return undefined - ; hetmet_pga_curryl <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_curryl_name else return undefined - ; hetmet_pga_curryr <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_curryr_name else return undefined ; let hpc_init | opt_Hpc = hpcInitCode mod ds_hpc_info | otherwise = empty @@ -171,127 +126,80 @@ deSugar hsc_env , foreign_prs `appOL` core_prs `appOL` spec_prs , spec_rules ++ ds_rules, ds_vects , ds_fords `appendStubC` hpc_init - , ds_hpc_info, modBreaks, hetmet_brak, hetmet_esc - , hetmet_flatten - , hetmet_unflatten - , hetmet_flattened_id - , hetmet_PGArrow - , hetmet_PGArrow_unit - , hetmet_PGArrow_tensor - , hetmet_PGArrow_exponent - , hetmet_pga_id - , hetmet_pga_comp - , hetmet_pga_first - , hetmet_pga_second - , hetmet_pga_cancell - , hetmet_pga_cancelr - , hetmet_pga_uncancell - , hetmet_pga_uncancelr - , hetmet_pga_assoc - , hetmet_pga_unassoc - , hetmet_pga_copy - , hetmet_pga_drop - , hetmet_pga_swap - , hetmet_pga_applyl - , hetmet_pga_applyr - , hetmet_pga_curryl - , hetmet_pga_curryr - ) } + , ds_hpc_info, modBreaks) + } ; 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 - , hetmet_flatten - , hetmet_unflatten - , hetmet_flattened_id - , hetmet_PGArrow - , hetmet_PGArrow_unit - , hetmet_PGArrow_tensor - , hetmet_PGArrow_exponent - , hetmet_pga_id - , hetmet_pga_comp - , hetmet_pga_first - , hetmet_pga_second - , hetmet_pga_cancell - , hetmet_pga_cancelr - , hetmet_pga_uncancell - , hetmet_pga_uncancelr - , hetmet_pga_assoc - , hetmet_pga_unassoc - , hetmet_pga_copy - , hetmet_pga_drop - , hetmet_pga_swap - , hetmet_pga_applyl - , hetmet_pga_applyr - , hetmet_pga_curryl - , hetmet_pga_curryr) -> do - - { -- Add export flags to bindings - keep_alive <- readIORef keep_var - ; let (rules_for_locals, rules_for_imps) + Just (ds_ev_binds, all_prs, all_rules, vects0, ds_fords, ds_hpc_info, modBreaks) -> do + + { -- Add export flags to bindings + keep_alive <- readIORef keep_var + ; let (rules_for_locals, rules_for_imps) = partition isLocalRule all_rules final_prs = addExportFlagsAndRules target - export_set keep_alive rules_for_locals (fromOL all_prs) - - final_pgm = simplifyBinds $ combineEvBinds ds_ev_binds final_prs - -- Notice that we put the whole lot in a big Rec, even the foreign binds - -- When compiling PrelFloat, which defines data Float = F# Float# - -- we want F# to be in scope in the foreign marshalling code! - -- You might think it doesn't matter, but the simplifier brings all top-level - -- things into the in-scope set before simplifying; so we get no unfolding for F#! - - -- Lint result if necessary, and print - ; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared, before opt" $ - (vcat [ pprCoreBindings final_pgm - , pprRules rules_for_imps ]) - - ; ds_binds <- if dopt Opt_F_coqpass dflags - then do { us <- mkSplitUniqSupply '~' - ; return (coqPassCoreToCore - hetmet_brak - hetmet_esc - hetmet_flatten - hetmet_unflatten - hetmet_flattened_id - us - final_pgm - hetmet_PGArrow - hetmet_PGArrow_unit - hetmet_PGArrow_tensor - hetmet_PGArrow_exponent - hetmet_pga_id - hetmet_pga_comp - hetmet_pga_first - hetmet_pga_second - hetmet_pga_cancell - hetmet_pga_cancelr - hetmet_pga_uncancell - hetmet_pga_uncancelr - hetmet_pga_assoc - hetmet_pga_unassoc - hetmet_pga_copy - hetmet_pga_drop - hetmet_pga_swap - hetmet_pga_applyl - hetmet_pga_applyr - hetmet_pga_curryl - hetmet_pga_curryr) + export_set keep_alive rules_for_locals (fromOL all_prs) + + final_pgm = let comb = combineEvBinds ds_ev_binds final_prs + in if dopt Opt_F_simpleopt_before_flatten dflags + then comb + else simplifyBinds comb + -- Notice that we put the whole lot in a big Rec, even the foreign binds + -- When compiling PrelFloat, which defines data Float = F# Float# + -- we want F# to be in scope in the foreign marshalling code! + -- You might think it doesn't matter, but the simplifier brings all top-level + -- things into the in-scope set before simplifying; so we get no unfolding for F#! + + ; (final_pgm1, rules_for_imps1, ds_vects1) <- if dopt Opt_F_simpleopt_before_flatten dflags + then simpleOptPgm dflags final_pgm rules_for_imps vects0 + else return (final_pgm, rules_for_imps, vects0) + + ; ds_binds1 <- if dopt Opt_F_coqpass dflags + then do { us1 <- mkSplitUniqSupply '*' -- hack + ; us2 <- mkSplitUniqSupply '~' -- hack + ; let do_flatten = dopt Opt_F_flatten dflags + ; let do_skolemize = dopt Opt_F_skolemize dflags + ; let mon = runCoreM hsc_env (mkRuleBase rules_for_imps1) us1 mod + $ coqPassCoreToCore do_flatten do_skolemize dsLookupVar dsLookupTyc us2 final_pgm1 + where + dsLookupVar :: String -> String -> CoreM Var + dsLookupVar modname varname + = do { name <- lookupOrigCoreM + (mkBaseModule (fsLit modname)) + (mkOccNameFS varName (fsLit varname)) + ; lookupId name + } + dsLookupTyc :: String -> String -> CoreM TyCon + dsLookupTyc modname tycname + = do { name <- lookupOrigCoreM + (mkBaseModule (fsLit modname)) + (mkOccNameFS tcName (fsLit tycname)) + ; lookupTyCon name + } + ; (ret,_) <- mon + ; return ret } else return final_pgm - ; (ds_binds', ds_rules_for_imps) <- simpleOptPgm dflags ds_binds rules_for_imps + ; (ds_binds2, ds_rules_for_imps2, ds_vects2) <- if dopt Opt_F_simpleopt_before_flatten dflags + then return (ds_binds1, rules_for_imps1, ds_vects1) + else simpleOptPgm dflags ds_binds1 rules_for_imps1 ds_vects1 -- The simpleOptPgm gets rid of type -- bindings plus any stupid dead code - ; dumpIfSet_dyn dflags Opt_D_coqpass "Coq Pass Output" $ text $ coqPassCoreToString ds_binds' + ; dumpIfSet_dyn dflags Opt_D_dump_proofs "Coq Pass Output" $ text $ coqPassCoreToString ds_binds1 - ; dumpIfSet_dyn dflags Opt_D_dump_coqpass "After Coq Pass" (text $ showSDoc $ pprCoreBindings ds_binds') + ; dumpIfSet_dyn dflags Opt_D_coqpass "After Coq Pass" (text $ showSDoc $ pprCoreBindings ds_binds1) - ; endPass dflags CoreDesugar ds_binds' ds_rules_for_imps + ; (ds_binds3, ds_rules_for_imps3, ds_vects3) + <- simpleOptPgm dflags ds_binds2 ds_rules_for_imps2 ds_vects2 + -- The simpleOptPgm gets rid of type + -- bindings plus any stupid dead code + + ; endPass dflags CoreDesugar ds_binds3 ds_rules_for_imps3 ; let used_names = mkUsedNames tcg_env - ; deps <- mkDependencies tcg_env + ; deps <- mkDependencies tcg_env ; let mod_guts = ModGuts { mg_module = mod, @@ -309,12 +217,12 @@ deSugar hsc_env mg_fam_insts = fam_insts, mg_inst_env = inst_env, mg_fam_inst_env = fam_inst_env, - mg_rules = ds_rules_for_imps, - mg_binds = ds_binds', + mg_rules = ds_rules_for_imps3, + mg_binds = ds_binds3, mg_foreign = ds_fords, mg_hpc_info = ds_hpc_info, mg_modBreaks = modBreaks, - mg_vect_decls = ds_vects, + mg_vect_decls = ds_vects2, mg_vect_info = noVectInfo } ; return (msgs, Just mod_guts) @@ -525,6 +433,8 @@ switching off EnableRewriteRules. See DsExpr.dsExplicitList. 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 #-} @@ -538,18 +448,13 @@ the rule is precisly to optimise them: \begin{code} dsVect :: LVectDecl Id -> DsM CoreVect -dsVect (L loc (HsVect v rhs)) +dsVect (L loc (HsVect (L _ v) rhs)) = putSrcSpanDs loc $ do { rhs' <- fmapMaybeM dsLExpr rhs - ; return $ Vect (unLoc v) rhs' + ; return $ Vect 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') --- } +dsVect (L _loc (HsNoVect (L _ v))) + = return $ NoVect v \end{code} @@ -565,13 +470,14 @@ simplify (Var v) = Var v simplify (App e1 e2) = App (simplify e1) (simplify e2) simplify (Lit lit) = Lit lit simplify (Note note e) = Note note (simplify e) -simplify (Cast e co) = if tcEqType (fst $ coercionKind co) (snd $ coercionKind co) +simplify (Cast e co) = if eqType (fst $ unPair $ coercionKind co) (snd $ unPair $ coercionKind co) then simplify e else Cast (simplify e) co simplify (Lam v e) = Lam v (simplify e) -simplify (Type t) = Type t simplify (Case e b ty as) = Case (simplify e) b ty (map (\(a,b,e) -> (a,b,simplify e)) as) simplify (Let bind body) = foldr Let (simplify body) (simplifyBind bind) +simplify (Type t) = Type t +simplify (Coercion co) = Coercion co simplifyBind :: Bind CoreBndr -> [Bind CoreBndr] simplifyBind (NonRec b e) = [NonRec b (simplify e)] @@ -582,4 +488,4 @@ simplifyBind (Rec (rbs@((b,e):rbs'))) = else (NonRec b (simplify e)):(simplifyBind $ Rec rbs') simplifyBinds = concatMap simplifyBind -\end{code} \ No newline at end of file +\end{code}