[project @ 1996-04-07 15:41:24 by partain]

[ghc-hetmet.git] / ghc / compiler / main / MkIface.lhs

diff --git a/ghc/compiler/main/MkIface.lhs b/ghc/compiler/main/MkIface.lhs
index 0b8de5f..1e60923 100644 (file)
--- a/ghc/compiler/main/MkIface.lhs
+++ b/ghc/compiler/main/MkIface.lhs
@@ -163,7 +163,6 @@ mkInterface modname export_list_fns inline_env tycon_specs
        -- mkInterface to do I/O (WDP 94/10)
        error "Can't produce interface file because of errors!\n"
     else
---  trace ("mkIface:Ids:"++(ppShow 80 (ppr PprDebug global_ids))) (
     ppAboves
        [ppPStr SLIT("{-# GHC_PRAGMA INTERFACE VERSION 7 #-}"),
        ppCat [ppPStr SLIT("interface"), ppPStr modname, ppPStr SLIT("where")],
@@ -181,7 +180,6 @@ mkInterface modname export_list_fns inline_env tycon_specs
 
        ppChar '\n'
        ]
---  )
   where
     any_purely_local tycons classes vals
       =  any bad_tc tycons || any bad_cl classes || any bad_id vals
@@ -322,13 +320,13 @@ get_tycon_pair tycon
                        ExportAbs   -> orig_nm
                        NotExported -> orig_nm
 
-       cons        = getTyConDataCons tycon
+       cons        = tyConDataCons tycon
     in
     (orig_mod, nm_to_print) }
 
 generic_pair thing
   = case (getOrigName       thing) of { (orig_mod, orig_nm) ->
-    case (getOccurrenceName thing) of { occur_name ->
+    case (getOccName thing) of { occur_name ->
     (orig_mod, orig_nm) }}
 \end{code}
 
@@ -383,7 +381,7 @@ do_value better_id_fn inline_env val
   = let
        sty         = PprInterface
        better_val  = better_id_fn val
-       name_str    = getOccurrenceName better_val -- NB: not orig name!
+       name_str    = getOccName better_val -- NB: not orig name!
 
        id_info     = getIdInfo better_val
 
@@ -411,7 +409,7 @@ do_value better_id_fn inline_env val
                        ppPStr SLIT("#-}")]
     in
     ppAbove (ppCat [ppr_non_op name_str,
-                   ppPStr SLIT("::"), pprType sty val_ty])
+                   ppPStr SLIT("::"), pprGenType sty val_ty])
            pp_id_info
 
 -- sadly duplicates Outputable.pprNonOp (ToDo)
@@ -515,10 +513,10 @@ is_exportable_tycon_or_class export_list_fns tc
            export_list_fns tc
 
 in_export_list_or_among_dotdot_modules ignore_Mdotdots (in_export_list, among_dotdot_modules) tc
-  = if in_export_list (getOccurrenceName tc) then
+  = if in_export_list (getOccName tc) then
        True
     else
---     pprTrace "in_export:" (ppAbove (ppr PprDebug ignore_Mdotdots) (ppPStr (getOccurrenceName tc))) (
+--     pprTrace "in_export:" (ppAbove (ppr PprDebug ignore_Mdotdots) (ppPStr (getOccName  tc))) (
     if ignore_Mdotdots then
        False
     else