swap <[]> and <{}> syntax
[ghc-hetmet.git] / compiler / deSugar / Desugar.lhs
index 98fd1e6..16e690f 100644 (file)
@@ -14,10 +14,15 @@ 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 )
 import PprCore
 import DsMonad
 import DsExpr
@@ -30,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
@@ -40,6 +46,12 @@ import MonadUtils
 import OrdList
 import Data.List
 import Data.IORef
+import PrelNames
+import UniqSupply
+import UniqFM
+import CoreFVs
+import Type
+import Coercion
 \end{code}
 
 %************************************************************************
@@ -49,6 +61,7 @@ import Data.IORef
 %************************************************************************
 
 \begin{code}
+
 -- | Main entry point to the desugarer.
 deSugar :: HscEnv -> ModLocation -> TcGblEnv -> IO (Messages, Maybe ModGuts)
 -- Can modify PCS by faulting in more declarations
@@ -98,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
@@ -112,7 +126,8 @@ 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) }
+                                   , ds_hpc_info, modBreaks)
+                                   }
 
         ; case mb_res of {
            Nothing -> return (msgs, Nothing) ;
@@ -125,24 +140,63 @@ 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 = 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 ])
-
-        ; (ds_binds, ds_rules_for_imps, ds_vects) 
-            <- simpleOptPgm dflags final_pgm rules_for_imps vects0
+       ; (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_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_binds1
+
+        ; dumpIfSet_dyn dflags Opt_D_coqpass "After Coq Pass" (text $ showSDoc $ pprCoreBindings ds_binds1)
+
+        ; (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
@@ -163,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)
@@ -399,6 +453,39 @@ dsVect (L loc (HsVect (L _ v) rhs))
     do { rhs' <- fmapMaybeM dsLExpr rhs
        ; return $ Vect v rhs'
           }
-dsVect (L loc (HsNoVect (L _ v)))
+dsVect (L _loc (HsNoVect (L _ v)))
   = return $ NoVect v
 \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 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 (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)]
+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}