X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FdeSugar%2FDesugar.lhs;h=cbf64e220fbf1b47a53cd453501094ce6610a2da;hp=14e4eea0d15935a70a770877c2ed1bc661c3eacd;hb=aee44bbe090c356d649398a93e260d967a7c50db;hpb=cf686352ffb4cf6e04cb94f1c673e394f6ff05c1

diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs
index 14e4eea..cbf64e2 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,7 +41,6 @@ import MonadUtils
 import OrdList
 import Data.List
 import Data.IORef
-import Control.Exception ( catch, ErrorCall, Exception(..) )
 \end{code}
 
 %************************************************************************
@@ -138,26 +137,16 @@ 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 return $ coqPassCoreToCore 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
@@ -245,7 +234,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 $
@@ -255,10 +244,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}