[project @ 1999-07-14 13:35:49 by sewardj]

Changed vars of the form _unused to zz_unused, since 3.02 doesn't understand
this convention.

diff --git a/ghc/compiler/cprAnalysis/CprAnalyse.lhs b/ghc/compiler/cprAnalysis/CprAnalyse.lhs
index 23dd460..3b2fa31 100644 (file)
--- a/ghc/compiler/cprAnalysis/CprAnalyse.lhs
+++ b/ghc/compiler/cprAnalysis/CprAnalyse.lhs
@@ -172,8 +172,8 @@ cprAnalExpr rho e@(Var v)
                               case (maybeUnfoldingTemplate.getIdUnfolding) v of
                                 Just e ->  if isCon e then snd $ cprAnalExpr rho e 
                                           else ids_inf
-                                _other -> ids_inf
-                         _other -> ids_inf
+                                zz_other -> ids_inf
+                         zz_other -> ids_inf
 
 -- Return constructor with decorated arguments.  If constructor 
 -- has product type then this is a manifest constructor (hooray!)
@@ -309,10 +309,10 @@ pinCPR v e av = case av of
     addCpr = (setIdCprInfo v).absToCprInfo
     v_type = varType v
     -- Split argument types and result type from v's type
-    (_, argtys, _result_type) = splitTypeToFunArgAndRes v_type
+    (_, argtys, zz_result_type) = splitTypeToFunArgAndRes v_type
     v_is_fn = argtys /= []
     -- val_binders are the explicit lambdas at the head of the expression
-    (binders,_stripped_exp) = collectBinders e
+    (binders,zz_stripped_exp) = collectBinders e
     val_binders = filter (not.isTyVar) binders
 
 filterAbsTuple :: (AbsVal, Type) -> AbsVal

diff --git a/ghc/compiler/rename/RnEnv.lhs b/ghc/compiler/rename/RnEnv.lhs
index f8dab26..f4cdea1 100644 (file)
--- a/ghc/compiler/rename/RnEnv.lhs
+++ b/ghc/compiler/rename/RnEnv.lhs
@@ -744,7 +744,7 @@ warnUnusedGroup emit_warning names
 
     reportable name = case occNameUserString (nameOccName name) of
                        ('_' : _) -> False
-                       _other    -> True
+                       zz_other  -> True
        -- Haskell 98 encourages compilers to suppress warnings about
        -- unused names in a pattern if they start with "_".
 \end{code}

diff --git a/ghc/compiler/typecheck/TcGenDeriv.lhs b/ghc/compiler/typecheck/TcGenDeriv.lhs
index 4937d47..28ae0d9 100644 (file)
--- a/ghc/compiler/typecheck/TcGenDeriv.lhs
+++ b/ghc/compiler/typecheck/TcGenDeriv.lhs
@@ -784,7 +784,7 @@ gen_Read_binds fixities tycon
            read_con_comprehensions
              = map read_con (tyConDataCons tycon)
        in
-       mk_easy_FunMonoBind tycon_loc readsPrec_RDR [_a_Pat, b_Pat] [] (
+       mk_easy_FunMonoBind tycon_loc readsPrec_RDR [zz_a_Pat, b_Pat] [] (
              foldr1 append_Expr read_con_comprehensions
        )
       where
@@ -916,7 +916,7 @@ gen_Read_binds fixities tycon
 
           read_paren_arg   -- parens depend on precedence...
            | nullary_con  = false_Expr -- it's optional.
-           | otherwise    = HsPar (genOpApp _a_Expr gt_RDR (HsLit (HsInt paren_prec_limit)))
+           | otherwise    = HsPar (genOpApp zz_a_Expr gt_RDR (HsLit (HsInt paren_prec_limit)))
 \end{code}
 
 %************************************************************************
@@ -1369,7 +1369,7 @@ genOpApp e1 op e2 = mkOpApp e1 op e2
 qual_orig_name n = nameRdrName (getName n)
 varUnqual n      = mkSrcUnqual varName n
 
-_a_RDR         = varUnqual SLIT("_a")
+zz_a_RDR       = varUnqual SLIT("_a")
 a_RDR          = varUnqual SLIT("a")
 b_RDR          = varUnqual SLIT("b")
 c_RDR          = varUnqual SLIT("c")
@@ -1387,7 +1387,7 @@ cs_RDRs           = [ varUnqual (_PK_ ("c"++show i)) | i <- [(1::Int) .. ] ]
 
 mkHsString s = HsString (_PK_ s)
 
-_a_Expr                = HsVar _a_RDR
+zz_a_Expr      = HsVar zz_a_RDR
 a_Expr         = HsVar a_RDR
 b_Expr         = HsVar b_RDR
 c_Expr         = HsVar c_RDR
@@ -1403,7 +1403,7 @@ tagToEnum_Expr    = HsVar tagToEnumH_RDR
 con2tag_Expr tycon = HsVar (con2tag_RDR tycon)
 
 wildPat                = WildPatIn
-_a_Pat         = VarPatIn _a_RDR
+zz_a_Pat       = VarPatIn zz_a_RDR
 a_Pat          = VarPatIn a_RDR
 b_Pat          = VarPatIn b_RDR
 c_Pat          = VarPatIn c_RDR