diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-10-28 22:02:43 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-10-28 22:02:43 +0100 |
| commit | 9b0d70eaffb399882579e0024d7761fb81b8aefb (patch) | |
| tree | d6289e88e1a82f0512d1bf87be4203c98888bfe6 | |
| parent | b4be080115cd121cf57d9c2e37bc42d9abf33706 (diff) | |
| download | haskell-cpr-sum-types.tar.gz | |
Wibblescpr-sum-types
| -rw-r--r-- | compiler/basicTypes/DataCon.lhs-boot | 3 | ||||
| -rw-r--r-- | compiler/basicTypes/Name.lhs | 2 | ||||
| -rw-r--r-- | compiler/coreSyn/CoreUnfold.lhs | 1 | ||||
| -rw-r--r-- | compiler/iface/BinIface.hs | 1 | ||||
| -rw-r--r-- | compiler/simplCore/Simplify.lhs | 3 |
5 files changed, 3 insertions, 7 deletions
diff --git a/compiler/basicTypes/DataCon.lhs-boot b/compiler/basicTypes/DataCon.lhs-boot index e91fe33312..92703c1c6c 100644 --- a/compiler/basicTypes/DataCon.lhs-boot +++ b/compiler/basicTypes/DataCon.lhs-boot @@ -6,11 +6,10 @@ import Outputable( Outputable ) data DataCon instance Eq DataCon +instance Ord DataCon instance Show DataCon instance Outputable DataCon dataConName :: DataCon -> Name isVanillaDataCon :: DataCon -> Bool -instance Eq DataCon -instance Ord DataCon \end{code} diff --git a/compiler/basicTypes/Name.lhs b/compiler/basicTypes/Name.lhs index 7e5d017054..1fcdd56aec 100644 --- a/compiler/basicTypes/Name.lhs +++ b/compiler/basicTypes/Name.lhs @@ -448,7 +448,7 @@ pprExternal sty uniq mod occ name is_wired is_builtin -- In code style, always qualify -- ToDo: maybe we could print all wired-in things unqualified -- in code style, to reduce symbol table bloat? - | debugStyle sty = ppr mod <> dot <> ppr_occ_name occ + | debugStyle sty = pp_mod <> ppr_occ_name occ <> (ppUnless opt_SuppressAll $ braces (hsep [if is_wired then ptext (sLit "(w)") else empty, pprNameSpaceBrief (occNameSpace occ), diff --git a/compiler/coreSyn/CoreUnfold.lhs b/compiler/coreSyn/CoreUnfold.lhs index 6544c10104..9429d45a71 100644 --- a/compiler/coreSyn/CoreUnfold.lhs +++ b/compiler/coreSyn/CoreUnfold.lhs @@ -56,7 +56,6 @@ import BasicTypes import Type import PrelNames import Bag -import Util import FastTypes import FastString import Outputable diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs index fd6bf6f61b..35b8a18b5f 100644 --- a/compiler/iface/BinIface.hs +++ b/compiler/iface/BinIface.hs @@ -27,7 +27,6 @@ import IfaceSyn import Module import Name import Avail -import VarEnv import DynFlags import UniqFM import UniqSupply diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs index 2f5be8637e..b0d0254797 100644 --- a/compiler/simplCore/Simplify.lhs +++ b/compiler/simplCore/Simplify.lhs @@ -667,8 +667,7 @@ completeBind env top_lvl old_bndr new_bndr new_rhs -- than that of the strictness sig. This can happen: see Note [Arity decrease]. info3 | isEvaldUnfolding new_unfolding || (case strictnessInfo info2 of - Just (StrictSig dmd_ty) -> new_arity < dmdTypeDepth dmd_ty - Nothing -> False) + StrictSig dmd_ty -> new_arity < dmdTypeDepth dmd_ty) = zapDemandInfo info2 `orElse` info2 | otherwise = info2 |