add -fflatten and -funsafe-skolemize flags
[ghc-hetmet.git] / compiler / deSugar / Desugar.lhs
index 603c858..f219c01 100644 (file)
@@ -43,6 +43,10 @@ import Data.List
 import Data.IORef
 import PrelNames
 import UniqSupply
+import UniqFM
+import CoreFVs
+import Type
+import Coercion
 \end{code}
 
 %************************************************************************
@@ -52,6 +56,7 @@ import UniqSupply
 %************************************************************************
 
 \begin{code}
+
 -- | Main entry point to the desugarer.
 deSugar :: HscEnv -> ModLocation -> TcGblEnv -> IO (Messages, Maybe ModGuts)
 -- Can modify PCS by faulting in more declarations
@@ -92,7 +97,32 @@ deSugar hsc_env
               <- case target of
                   HscNothing ->
                        return (emptyMessages,
-                               Just ([], nilOL, [], [], NoStubs, hpcInfo, emptyModBreaks, undefined, undefined))
+                               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
+                               ))
                    _        -> do
                      (binds_cvr,ds_hpc_info, modBreaks)
                         <- if (opt_Hpc
@@ -110,6 +140,30 @@ deSugar hsc_env
                           ; 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
@@ -117,11 +171,61 @@ 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) }
+                                   , 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
+                                   ) }
 
         ; 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
+           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
@@ -130,7 +234,7 @@ deSugar hsc_env
               final_prs = addExportFlagsAndRules target
                              export_set keep_alive rules_for_locals (fromOL all_prs)
 
-              final_pgm = combineEvBinds ds_ev_binds final_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!
@@ -142,19 +246,51 @@ deSugar hsc_env
                (vcat [ pprCoreBindings final_pgm
                      , pprRules rules_for_imps ])
 
-       ; (ds_binds, ds_rules_for_imps) <- simpleOptPgm dflags final_pgm rules_for_imps
+        ; ds_binds <- 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
+                               ; return (coqPassCoreToCore
+                                             do_flatten
+                                             do_skolemize
+                                             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)
+                               }
+                       else return final_pgm
+
+       ; (ds_binds', ds_rules_for_imps) <- simpleOptPgm dflags ds_binds rules_for_imps
                         -- 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_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')
+        ; dumpIfSet_dyn dflags Opt_D_coqpass "After Coq Pass" (text $ showSDoc $ pprCoreBindings ds_binds')
 
        ; endPass dflags CoreDesugar ds_binds' ds_rules_for_imps
 
@@ -419,3 +555,35 @@ dsVect (L loc (HsVect v rhs))
 --        ; return $ Vect v (Just rhs')
 --       }
 \end{code}
+
+
+
+\begin{code}
+--
+-- Simplification routines run before the flattener.  We can't use
+-- simpleOptPgm -- it doesn't preserve the order of subexpressions or
+-- let-binding groups.
+--
+simplify :: Expr CoreBndr -> Expr CoreBndr
+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)
+                                       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)
+
+simplifyBind :: Bind CoreBndr -> [Bind CoreBndr]
+simplifyBind (NonRec b e)             = [NonRec b (simplify e)]
+simplifyBind (Rec [])                 = []
+simplifyBind (Rec (rbs@((b,e):rbs'))) =
+    if or $ map (\x -> elemUFM x (exprFreeIds e)) (map fst rbs)
+    then [Rec (map (\(v,e) -> (v,simplify e)) rbs)]
+    else (NonRec b (simplify e)):(simplifyBind $ Rec rbs')
+
+simplifyBinds = concatMap simplifyBind
+\end{code}
\ No newline at end of file