; case mb_res of {
Nothing -> return (msgs, Nothing) ;
- Just (ds_ev_binds, all_prs, all_rules, ds_vects, ds_fords,ds_hpc_info, modBreaks
+ Just (ds_ev_binds, all_prs, all_rules, vects0, ds_fords, ds_hpc_info, modBreaks
, hetmet_brak, hetmet_esc
, hetmet_flatten
, hetmet_unflatten
, hetmet_pga_loopr
) -> do
- { -- Add export flags to bindings
- keep_alive <- readIORef keep_var
- ; let (rules_for_locals, rules_for_imps)
+ { -- 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)
+ 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#!
-
- -- Lint result if necessary, and print
- ; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared, before opt" $
- (vcat [ pprCoreBindings final_pgm
- , pprRules rules_for_imps ])
-
- ; (final_pgm', rules_for_imps') <- if dopt Opt_F_simpleopt_before_flatten dflags
- then simpleOptPgm dflags final_pgm rules_for_imps
- else return (final_pgm, rules_for_imps)
-
- ; ds_binds <- if dopt Opt_F_coqpass dflags
+ -- 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 { us <- mkSplitUniqSupply '~'
; let do_flatten = dopt Opt_F_flatten dflags
; let do_skolemize = dopt Opt_F_skolemize dflags
hetmet_unflatten
hetmet_flattened_id
us
- final_pgm'
+ final_pgm1
hetmet_PGArrow
hetmet_PGArrow_unit
hetmet_PGArrow_tensor
}
else return final_pgm
- ; (ds_binds', ds_rules_for_imps) <- if dopt Opt_F_simpleopt_before_flatten dflags
- then return (ds_binds, rules_for_imps')
- else 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_dump_proofs "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_coqpass "After Coq Pass" (text $ showSDoc $ pprCoreBindings ds_binds1)
- ; dumpIfSet_dyn dflags Opt_D_coqpass "After Coq Pass" (text $ showSDoc $ pprCoreBindings ds_binds')
+ ; (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_binds' ds_rules_for_imps
+ ; 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,
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)
\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}
projects / ghc-hetmet.git / blobdiff