[project @ 2002-04-29 14:03:38 by simonmar]

[ghc-hetmet.git] / ghc / compiler / deSugar / Desugar.lhs

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 8e2a33c..55152d9 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -37,6 +37,7 @@ import ErrUtils               ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings )
 import Outputable
 import UniqSupply      ( mkSplitUniqSupply )
 import HscTypes                ( HomeSymbolTable, PersistentCompilerState(..), TyThing(..), lookupType,  )
+import FastString
 \end{code}
 
 %************************************************************************
@@ -53,14 +54,13 @@ deSugar :: DynFlags
        -> PersistentCompilerState -> HomeSymbolTable
        -> Module -> PrintUnqualified
         -> TcResults
-       -> IO (ModDetails, (SDoc, SDoc, [FAST_STRING], [CoreBndr]))
+       -> IO (ModDetails, (SDoc, SDoc, [FastString], [CoreBndr]))
 
 deSugar dflags pcs hst mod_name unqual
         (TcResults {tc_env    = type_env,
                    tc_binds  = all_binds,
                    tc_insts  = insts,
                    tc_rules  = rules,
---                 tc_cbinds = core_binds,
                    tc_fords  = fo_decls})
   = do { showPass dflags "Desugar"
        ; us <- mkSplitUniqSupply 'd'
@@ -71,12 +71,6 @@ deSugar dflags pcs hst mod_name unqual
 
              (ds_binds, ds_rules, foreign_stuff) = ds_result
              
-{-
-             addCoreBinds ls =
-               case core_binds of
-                 [] -> ls
-                 cs -> (Rec cs) : ls
--}     
              mod_details = ModDetails { md_types = type_env,
                                         md_insts = insts,
                                         md_rules = ds_rules,
@@ -165,20 +159,19 @@ ppr_ds_rules rules
 Simplest thing in the world, desugaring External Core:
 
 \begin{code}
-deSugarCore :: TypeEnv -> [TypecheckedCoreBind]
-           -> IO (ModDetails, (SDoc, SDoc, [FAST_STRING], [CoreBndr]))
-deSugarCore type_env cs = do
-  let
-    mod_details 
-      = ModDetails { md_types = type_env
-                  , md_insts = []
-                  , md_rules = []
-                  , md_binds = [Rec (map (\ (lhs,_,rhs) -> (lhs,rhs)) cs)]
-                  }
+deSugarCore :: (TypeEnv, [TypecheckedCoreBind], [TypecheckedRuleDecl])
+           -> IO (ModDetails, (SDoc, SDoc, [FastString], [CoreBndr]))
+deSugarCore (type_env, pairs, rules) 
+  = return (mod_details, no_foreign_stuff)
+  where
+    mod_details = ModDetails { md_types = type_env
+                            , md_insts = []
+                            , md_rules = ds_rules
+                            , md_binds = ds_binds }
+    ds_binds = [Rec pairs]
+    ds_rules = [(fun,rule) | IfaceRuleOut fun rule <- rules]
 
     no_foreign_stuff = (empty,empty,[],[])
-  return (mod_details, no_foreign_stuff)
-    
 \end{code}