minimize impact on PrelNames

diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs
index 1ba877a..8ac2819 100644 (file)
--- a/compiler/deSugar/Desugar.lhs
+++ b/compiler/deSugar/Desugar.lhs
@@ -14,9 +14,11 @@ import HscTypes
 import HsSyn
 import TcRnTypes
 import MkIface
 import HsSyn
 import TcRnTypes
 import MkIface

+import IfaceEnv

 import Id
 import Pair
 import Name
 import Id
 import Pair
 import Name

+import FastString

 import CoreSyn
 import CoreSubst
 import CoqPass ( coqPassCoreToString, coqPassCoreToCore )
 import CoreSyn
 import CoreSubst
 import CoqPass ( coqPassCoreToString, coqPassCoreToCore )

@@ -98,34 +100,7 @@ deSugar hsc_env
               <- case target of
                   HscNothing ->
                        return (emptyMessages,
               <- 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, undefined))

                    _        -> do
                      (binds_cvr,ds_hpc_info, modBreaks)
                         <- if (opt_Hpc
                    _        -> do
                      (binds_cvr,ds_hpc_info, modBreaks)
                         <- if (opt_Hpc

@@ -134,6 +109,7 @@ deSugar hsc_env
                               then addCoverageTicksToBinds dflags mod mod_loc
                                                            (typeEnvTyCons type_env) binds 
                               else return (binds, hpcInfo, emptyModBreaks)
                               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
                      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 +117,93 @@ deSugar hsc_env
                           ; (ds_fords, foreign_prs) <- dsForeigns fords
                           ; ds_rules <- mapMaybeM dsRule rules
                           ; ds_vects <- mapM dsVect vects
                           ; (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
+                          ; junk <- if dopt Opt_F_coqpass dflags
+                                    then do { hetmet_brak_name <- lookupOrig gHC_HETMET_CODETYPES (mkOccNameFS varName (fsLit "hetmet_brak"))
+                                            ; hetmet_brak <- dsLookupGlobalId hetmet_brak_name
+                                            ; hetmet_esc_name <- lookupOrig gHC_HETMET_CODETYPES (mkOccNameFS varName (fsLit "hetmet_esc"))
+                                            ; hetmet_esc  <- dsLookupGlobalId hetmet_esc_name 
+                                            ; hetmet_flatten_name <- lookupOrig gHC_HETMET_CODETYPES (mkOccNameFS varName (fsLit "hetmet_flatten"))
+                                            ; hetmet_flatten <- dsLookupGlobalId hetmet_flatten_name
+                                            ; hetmet_unflatten_name <- lookupOrig gHC_HETMET_CODETYPES (mkOccNameFS varName (fsLit "pga_unflatten"))
+                                            ; hetmet_unflatten <- dsLookupGlobalId hetmet_unflatten_name
+                                            ; hetmet_flattened_id_name <- lookupOrig gHC_HETMET_CODETYPES (mkOccNameFS varName (fsLit "pga_flattened_id"))
+                                            ; hetmet_flattened_id <- dsLookupGlobalId hetmet_flattened_id_name
+                                            ; hetmet_PGArrow_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS tcName (fsLit "PGArrow"))
+                                            ; hetmet_PGArrow <- dsLookupTyCon hetmet_PGArrow_name
+                                            ; hetmet_PGArrow_unit_name <- lookupOrig gHC_HETMET_GARROW (mkOccNameFS tcName (fsLit "GArrowUnit"))
+                                            ; hetmet_PGArrow_unit <- dsLookupTyCon hetmet_PGArrow_unit_name
+                                            ; hetmet_PGArrow_tensor_name <- lookupOrig gHC_HETMET_GARROW (mkOccNameFS tcName (fsLit "GArrowTensor"))
+                                            ; hetmet_PGArrow_tensor <- dsLookupTyCon hetmet_PGArrow_tensor_name
+                                            ; hetmet_PGArrow_exponent_name <- lookupOrig gHC_HETMET_GARROW (mkOccNameFS tcName (fsLit "GArrowExponent"))
+                                            ; hetmet_PGArrow_exponent <- dsLookupTyCon hetmet_PGArrow_exponent_name
+                                            ; hetmet_pga_id_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_id"))
+                                            ; hetmet_pga_id <- dsLookupGlobalId hetmet_pga_id_name
+                                            ; hetmet_pga_comp_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_comp"))
+                                            ; hetmet_pga_comp <- dsLookupGlobalId hetmet_pga_comp_name
+                                            ; hetmet_pga_first_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_first"))
+                                            ; hetmet_pga_first <- dsLookupGlobalId hetmet_pga_first_name
+                                            ; hetmet_pga_second_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_second"))
+                                            ; hetmet_pga_second <- dsLookupGlobalId hetmet_pga_second_name
+                                            ; hetmet_pga_cancell_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_cancell"))
+                                            ; hetmet_pga_cancell <- dsLookupGlobalId hetmet_pga_cancell_name
+                                            ; hetmet_pga_cancelr_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_cancelr"))
+                                            ; hetmet_pga_cancelr <- dsLookupGlobalId hetmet_pga_cancelr_name
+                                            ; hetmet_pga_uncancell_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_uncancell"))
+                                            ; hetmet_pga_uncancell <- dsLookupGlobalId hetmet_pga_uncancell_name
+                                            ; hetmet_pga_uncancelr_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_uncancelr"))
+                                            ; hetmet_pga_uncancelr <- dsLookupGlobalId hetmet_pga_uncancelr_name
+                                            ; hetmet_pga_assoc_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_assoc"))
+                                            ; hetmet_pga_assoc <- dsLookupGlobalId hetmet_pga_assoc_name
+                                            ; hetmet_pga_unassoc_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_unassoc"))
+                                            ; hetmet_pga_unassoc <- dsLookupGlobalId hetmet_pga_unassoc_name
+                                            ; hetmet_pga_copy_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_copy"))
+                                            ; hetmet_pga_copy <- dsLookupGlobalId hetmet_pga_copy_name
+                                            ; hetmet_pga_drop_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_drop"))
+                                            ; hetmet_pga_drop <- dsLookupGlobalId hetmet_pga_drop_name
+                                            ; hetmet_pga_swap_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_swap"))
+                                            ; hetmet_pga_swap <- dsLookupGlobalId hetmet_pga_swap_name
+                                            ; hetmet_pga_applyl_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_applyl"))
+                                            ; hetmet_pga_applyl <- dsLookupGlobalId hetmet_pga_applyl_name
+                                            ; hetmet_pga_applyr_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_applyr"))
+                                            ; hetmet_pga_applyr <- dsLookupGlobalId hetmet_pga_applyr_name
+                                            ; hetmet_pga_curryl_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_curryl"))
+                                            ; hetmet_pga_curryl <- dsLookupGlobalId hetmet_pga_curryl_name
+                                            ; hetmet_pga_curryr_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_curryr"))
+                                            ; hetmet_pga_curryr <- dsLookupGlobalId hetmet_pga_curryr_name
+                                            ; hetmet_pga_loopl_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_loopl"))
+                                            ; hetmet_pga_loopl <- dsLookupGlobalId hetmet_pga_loopl_name
+                                            ; hetmet_pga_loopr_name <- lookupOrig gHC_HETMET_PRIVATE (mkOccNameFS varName (fsLit "pga_loopr"))
+                                            ; hetmet_pga_loopr <- dsLookupGlobalId hetmet_pga_loopr_name
+                                            ; return ( 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 )
+                                            }
+                                    else return undefined

                           ; let hpc_init
                                   | opt_Hpc   = hpcInitCode mod ds_hpc_info
                                   | otherwise = empty
                           ; let hpc_init
                                   | opt_Hpc   = hpcInitCode mod ds_hpc_info
                                   | otherwise = empty

@@ -176,66 +211,12 @@ deSugar hsc_env
                                    , foreign_prs `appOL` core_prs `appOL` spec_prs
                                    , spec_rules ++ ds_rules, ds_vects
                                    , ds_fords `appendStubC` hpc_init
                                    , 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, junk)
+                                   }

 
         ; case mb_res of {
            Nothing -> return (msgs, Nothing) ;
 
         ; 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, junk) -> do

 
         {       -- Add export flags to bindings
           keep_alive <- readIORef keep_var
 
         {       -- Add export flags to bindings
           keep_alive <- readIORef keep_var

@@ -262,40 +243,71 @@ deSugar hsc_env
                        then do { us <- mkSplitUniqSupply '~'
                                ; let do_flatten   = dopt Opt_F_flatten dflags
                                ; let do_skolemize = dopt Opt_F_skolemize 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_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
+                               ; (case junk of {
+                                     ( 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 ) ->
+                                           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

                                         )
                                         )

+                                            }
+                                 )

                                }
                        else return final_pgm
 
                                }
                        else return final_pgm
 

diff --git a/compiler/hetmet b/compiler/hetmet
index 423b0bd..7c9df3b 160000 (submodule)
--- a/compiler/hetmet
+++ b/compiler/hetmet
@@ -1 +1 @@
-Subproject commit 423b0bd3972c5bcbbd757cb715e13b5b9104a9a6
+Subproject commit 7c9df3b89842f11d0bcb00ab24012160174e5f7a

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index a2c81de..eaa3e8a 100644 (file)
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -214,32 +214,8 @@ basicKnownKeyNames
        randomClassName, randomGenClassName, monadPlusClassName,
 
         -- Code types
        randomClassName, randomGenClassName, monadPlusClassName,
 
         -- Code types

-        hetmet_brak_name, hetmet_esc_name, hetmet_csp_name, hetmet_flatten_name, hetmet_unflatten_name, hetmet_flattened_id_name,
-        hetmet_guest_integer_literal_name, hetmet_guest_string_literal_name,
-                                         hetmet_guest_char_literal_name,
-        hetmet_PGArrow_name,
-        hetmet_PGArrow_unit_name,
-        hetmet_PGArrow_tensor_name,
-        hetmet_PGArrow_exponent_name,
-        hetmet_pga_id_name,
-        hetmet_pga_comp_name,
-        hetmet_pga_first_name,
-        hetmet_pga_second_name,
-        hetmet_pga_cancell_name,
-        hetmet_pga_cancelr_name,
-        hetmet_pga_uncancell_name,
-        hetmet_pga_uncancelr_name,
-        hetmet_pga_assoc_name,
-        hetmet_pga_unassoc_name,
-        hetmet_pga_copy_name,
-        hetmet_pga_drop_name,
-        hetmet_pga_swap_name,
-        hetmet_pga_applyl_name,
-        hetmet_pga_applyr_name,
-        hetmet_pga_curryl_name,
-        hetmet_pga_curryr_name,
-        hetmet_pga_loopl_name,
-        hetmet_pga_loopr_name,
+        hetmet_brak_name, hetmet_esc_name, hetmet_csp_name,
+        hetmet_guest_integer_literal_name, hetmet_guest_string_literal_name, hetmet_guest_char_literal_name,

 
         -- Annotation type checking
         toAnnotationWrapperName
 
         -- Annotation type checking
         toAnnotationWrapperName

@@ -917,65 +893,15 @@ emptyPName          pkg = varQual (gHC_PARR pkg) (fsLit "emptyP")          empty
 appPName            pkg = varQual (gHC_PARR pkg) (fsLit "+:+")             appPIdKey
 
 -- code type things
 appPName            pkg = varQual (gHC_PARR pkg) (fsLit "+:+")             appPIdKey
 
 -- code type things

-hetmet_brak_name, hetmet_esc_name, hetmet_csp_name, hetmet_flatten_name, hetmet_unflatten_name, hetmet_flattened_id_name :: Name
+hetmet_brak_name, hetmet_esc_name, hetmet_csp_name :: Name

 hetmet_guest_integer_literal_name, hetmet_guest_string_literal_name, hetmet_guest_char_literal_name :: Name
 hetmet_brak_name = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_brak") hetmet_brak_key
 hetmet_esc_name  = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_esc")  hetmet_esc_key
 hetmet_csp_name  = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_csp") hetmet_csp_key
 hetmet_guest_integer_literal_name, hetmet_guest_string_literal_name, hetmet_guest_char_literal_name :: Name
 hetmet_brak_name = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_brak") hetmet_brak_key
 hetmet_esc_name  = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_esc")  hetmet_esc_key
 hetmet_csp_name  = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_csp") hetmet_csp_key

-hetmet_flatten_name  = varQual gHC_HETMET_CODETYPES (fsLit "pga_flatten") hetmet_flatten_key
-hetmet_unflatten_name  = varQual gHC_HETMET_CODETYPES (fsLit "pga_unflatten") hetmet_unflatten_key
-hetmet_flattened_id_name  = varQual gHC_HETMET_CODETYPES (fsLit "pga_flattened_id") hetmet_flattened_id_key

 hetmet_guest_integer_literal_name = varQual gHC_HETMET_CODETYPES (fsLit "guestIntegerLiteral") hetmet_guest_integer_literal_key
 hetmet_guest_string_literal_name  = varQual gHC_HETMET_CODETYPES (fsLit "guestStringLiteral")  hetmet_guest_string_literal_key
 hetmet_guest_char_literal_name    = varQual gHC_HETMET_CODETYPES (fsLit "guestCharLiteral")    hetmet_guest_char_literal_key
 
 hetmet_guest_integer_literal_name = varQual gHC_HETMET_CODETYPES (fsLit "guestIntegerLiteral") hetmet_guest_integer_literal_key
 hetmet_guest_string_literal_name  = varQual gHC_HETMET_CODETYPES (fsLit "guestStringLiteral")  hetmet_guest_string_literal_key
 hetmet_guest_char_literal_name    = varQual gHC_HETMET_CODETYPES (fsLit "guestCharLiteral")    hetmet_guest_char_literal_key
 

-hetmet_PGArrow_name :: Name
-hetmet_PGArrow_name = tcQual gHC_HETMET_PRIVATE (fsLit "PGArrow") hetmet_PGArrow_key
-hetmet_PGArrow_unit_name :: Name
-hetmet_PGArrow_unit_name = tcQual gHC_HETMET_GARROW (fsLit "GArrowUnit") hetmet_PGArrow_unit_key
-hetmet_PGArrow_tensor_name :: Name
-hetmet_PGArrow_tensor_name = tcQual gHC_HETMET_GARROW (fsLit "GArrowTensor") hetmet_PGArrow_tensor_key
-hetmet_PGArrow_exponent_name :: Name
-hetmet_PGArrow_exponent_name = tcQual gHC_HETMET_GARROW (fsLit "GArrowExponent") hetmet_PGArrow_exponent_key
-hetmet_pga_id_name :: Name
-hetmet_pga_id_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_id") hetmet_pga_id_key
-hetmet_pga_comp_name :: Name
-hetmet_pga_comp_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_comp") hetmet_pga_comp_key
-hetmet_pga_first_name :: Name
-hetmet_pga_first_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_first") hetmet_pga_first_key
-hetmet_pga_second_name :: Name
-hetmet_pga_second_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_second") hetmet_pga_second_key
-hetmet_pga_cancell_name :: Name
-hetmet_pga_cancell_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_cancell") hetmet_pga_cancell_key
-hetmet_pga_cancelr_name :: Name
-hetmet_pga_cancelr_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_cancelr") hetmet_pga_cancelr_key
-hetmet_pga_uncancell_name :: Name
-hetmet_pga_uncancell_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_uncancell") hetmet_pga_uncancell_key
-hetmet_pga_uncancelr_name :: Name
-hetmet_pga_uncancelr_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_uncancelr") hetmet_pga_uncancelr_key
-hetmet_pga_assoc_name :: Name
-hetmet_pga_assoc_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_assoc") hetmet_pga_assoc_key
-hetmet_pga_unassoc_name :: Name
-hetmet_pga_unassoc_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_unassoc") hetmet_pga_unassoc_key
-hetmet_pga_copy_name :: Name
-hetmet_pga_copy_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_copy") hetmet_pga_copy_key
-hetmet_pga_drop_name :: Name
-hetmet_pga_drop_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_drop") hetmet_pga_drop_key
-hetmet_pga_swap_name :: Name
-hetmet_pga_swap_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_swap") hetmet_pga_swap_key
-hetmet_pga_applyl_name :: Name
-hetmet_pga_applyl_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_applyl") hetmet_pga_applyl_key
-hetmet_pga_applyr_name :: Name
-hetmet_pga_applyr_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_applyr") hetmet_pga_applyr_key
-hetmet_pga_curryl_name :: Name
-hetmet_pga_curryl_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_curryl") hetmet_pga_curryl_key
-hetmet_pga_curryr_name :: Name
-hetmet_pga_curryr_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_curryr") hetmet_pga_curryr_key
-hetmet_pga_loopl_name :: Name
-hetmet_pga_loopl_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_loopl") hetmet_pga_loopl_key
-hetmet_pga_loopr_name :: Name
-hetmet_pga_loopr_name = varQual gHC_HETMET_PRIVATE (fsLit "pga_loopr") hetmet_pga_loopr_key
-

 -- IO things
 ioTyConName, ioDataConName, thenIOName, bindIOName, returnIOName,
     failIOName :: Name
 -- IO things
 ioTyConName, ioDataConName, thenIOName, bindIOName, returnIOName,
     failIOName :: Name

@@ -1596,62 +1522,12 @@ hetmet_guest_integer_literal_key, hetmet_guest_string_literal_key, hetmet_guest_
 hetmet_guest_integer_literal_key = mkPreludeMiscIdUnique 134
 hetmet_guest_string_literal_key  = mkPreludeMiscIdUnique 135
 hetmet_guest_char_literal_key    = mkPreludeMiscIdUnique 136
 hetmet_guest_integer_literal_key = mkPreludeMiscIdUnique 134
 hetmet_guest_string_literal_key  = mkPreludeMiscIdUnique 135
 hetmet_guest_char_literal_key    = mkPreludeMiscIdUnique 136

-hetmet_PGArrow_key :: Unique
-hetmet_PGArrow_key = mkPreludeMiscIdUnique 137
-hetmet_pga_id_key :: Unique
-hetmet_pga_id_key = mkPreludeMiscIdUnique 138
-hetmet_pga_comp_key :: Unique
-hetmet_pga_comp_key = mkPreludeMiscIdUnique 139
-hetmet_pga_first_key :: Unique
-hetmet_pga_first_key = mkPreludeMiscIdUnique 140
-hetmet_pga_second_key :: Unique
-hetmet_pga_second_key = mkPreludeMiscIdUnique 141
-hetmet_pga_cancell_key :: Unique
-hetmet_pga_cancell_key = mkPreludeMiscIdUnique 142
-hetmet_pga_cancelr_key :: Unique
-hetmet_pga_cancelr_key = mkPreludeMiscIdUnique 143
-hetmet_pga_uncancell_key :: Unique
-hetmet_pga_uncancell_key = mkPreludeMiscIdUnique 144
-hetmet_pga_uncancelr_key :: Unique
-hetmet_pga_uncancelr_key = mkPreludeMiscIdUnique 145
-hetmet_pga_assoc_key :: Unique
-hetmet_pga_assoc_key = mkPreludeMiscIdUnique 146
-hetmet_pga_unassoc_key :: Unique
-hetmet_pga_unassoc_key = mkPreludeMiscIdUnique 147
-hetmet_pga_copy_key :: Unique
-hetmet_pga_copy_key = mkPreludeMiscIdUnique 148
-hetmet_pga_drop_key :: Unique
-hetmet_pga_drop_key = mkPreludeMiscIdUnique 149
-hetmet_pga_swap_key :: Unique
-hetmet_pga_swap_key = mkPreludeMiscIdUnique 150
-hetmet_pga_applyl_key :: Unique
-hetmet_pga_applyl_key = mkPreludeMiscIdUnique 151
-hetmet_pga_applyr_key :: Unique
-hetmet_pga_applyr_key = mkPreludeMiscIdUnique 152
-hetmet_pga_curryl_key :: Unique
-hetmet_pga_curryl_key = mkPreludeMiscIdUnique 153
-hetmet_pga_curryr_key :: Unique
-hetmet_pga_curryr_key = mkPreludeMiscIdUnique 154
-hetmet_flatten_key = mkPreludeMiscIdUnique 155
-hetmet_unflatten_key = mkPreludeMiscIdUnique 156
-hetmet_flattened_id_key = mkPreludeMiscIdUnique 157
-hetmet_PGArrow_unit_key :: Unique
-hetmet_PGArrow_unit_key = mkPreludeMiscIdUnique 158
-hetmet_PGArrow_tensor_key :: Unique
-hetmet_PGArrow_tensor_key = mkPreludeMiscIdUnique 159
-hetmet_PGArrow_exponent_key :: Unique
-hetmet_PGArrow_exponent_key = mkPreludeMiscIdUnique 160
-
-hetmet_brak_key, hetmet_esc_key, hetmet_csp_key, hetmet_flatten_key, hetmet_unflatten_key, hetmet_flattened_id_key :: Unique
+
+hetmet_brak_key, hetmet_esc_key, hetmet_csp_key :: Unique

 hetmet_brak_key    = mkPreludeMiscIdUnique 161
 hetmet_esc_key     = mkPreludeMiscIdUnique 162
 hetmet_csp_key     = mkPreludeMiscIdUnique 163
 
 hetmet_brak_key    = mkPreludeMiscIdUnique 161
 hetmet_esc_key     = mkPreludeMiscIdUnique 162
 hetmet_csp_key     = mkPreludeMiscIdUnique 163
 

-hetmet_pga_loopl_key :: Unique
-hetmet_pga_loopl_key = mkPreludeMiscIdUnique 164
-hetmet_pga_loopr_key :: Unique
-hetmet_pga_loopr_key = mkPreludeMiscIdUnique 165
-

 
 ---------------- Template Haskell -------------------
 --     USES IdUniques 200-499
 
 ---------------- Template Haskell -------------------
 --     USES IdUniques 200-499