swap <[]> and <{}> syntax
[ghc-hetmet.git] / compiler / deSugar / Desugar.lhs
index 1ba877a..16e690f 100644 (file)
@@ -14,9 +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 )
@@ -32,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
@@ -98,34 +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
-                                    , undefined
-                                    , undefined
-                               ))
+                               Just ([], nilOL, [], [], NoStubs, hpcInfo, emptyModBreaks))
                    _        -> do
                      (binds_cvr,ds_hpc_info, modBreaks)
                         <- if (opt_Hpc
@@ -134,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
@@ -141,34 +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
-                          ; hetmet_pga_loopl <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_loopl_name else return undefined
-                          ; hetmet_pga_loopr <- if dopt Opt_F_coqpass dflags then dsLookupGlobalId hetmet_pga_loopr_name else return undefined
                           ; let hpc_init
                                   | opt_Hpc   = hpcInitCode mod ds_hpc_info
                                   | otherwise = empty
@@ -176,66 +126,12 @@ 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
-                                   , hetmet_pga_loopl
-                                   , hetmet_pga_loopr
-                                   ) }
+                                   , ds_hpc_info, modBreaks)
+                                   }
 
         ; case mb_res of {
            Nothing -> return (msgs, Nothing) ;
-           Just (ds_ev_binds, all_prs, all_rules, vects0, 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
-                                   , hetmet_pga_loopl
-                                   , hetmet_pga_loopr
-                                   ) -> do
+           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
@@ -259,43 +155,29 @@ deSugar hsc_env
                                                       else return (final_pgm, rules_for_imps, vects0)
 
         ; ds_binds1 <- if dopt Opt_F_coqpass dflags
-                       then do { us <- mkSplitUniqSupply '~'
+                       then do { us1 <- mkSplitUniqSupply '*'  -- hack
+                               ; us2 <- mkSplitUniqSupply '~'  -- hack
                                ; 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_pgm1
-                                             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
-                                             hetmet_pga_loopl
-                                             hetmet_pga_loopr
-                                        )
+                               ; 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