diff options
| author | Max Bolingbroke <batterseapower@hotmail.com> | 2011-09-09 13:45:41 +0100 |
|---|---|---|
| committer | Max Bolingbroke <batterseapower@hotmail.com> | 2011-09-09 14:11:00 +0100 |
| commit | b3bc5f4f49a01be12aff0e4369db62331c147179 (patch) | |
| tree | 0321f6f04b86128e236e265a353313e05381e632 /compiler/codeGen | |
| parent | c2bd94c1d91dcd90007fe9f33b8e45ceb509c995 (diff) | |
| parent | 99a52b00cc77a38f66202ddb3d6ce1dd4a654081 (diff) | |
| download | haskell-b3bc5f4f49a01be12aff0e4369db62331c147179.tar.gz | |
Merge branch 'no-pred-ty'
Conflicts:
compiler/iface/BuildTyCl.lhs
compiler/iface/MkIface.lhs
compiler/iface/TcIface.lhs
compiler/typecheck/TcTyClsDecls.lhs
compiler/types/Class.lhs
compiler/utils/Util.lhs
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/ClosureInfo.lhs | 6 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmClosure.hs | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/compiler/codeGen/ClosureInfo.lhs b/compiler/codeGen/ClosureInfo.lhs index 04f7acb68c..66eeb34c5f 100644 --- a/compiler/codeGen/ClosureInfo.lhs +++ b/compiler/codeGen/ClosureInfo.lhs @@ -1091,15 +1091,9 @@ getTyDescription ty AppTy fun _ -> getTyDescription fun FunTy _ res -> '-' : '>' : fun_result res TyConApp tycon _ -> getOccString tycon - PredTy sty -> getPredTyDescription sty ForAllTy _ ty -> getTyDescription ty } where fun_result (FunTy _ res) = '>' : fun_result res fun_result other = getTyDescription other - -getPredTyDescription :: PredType -> String -getPredTyDescription (ClassP cl _) = getOccString cl -getPredTyDescription (IParam ip _) = getOccString (ipNameName ip) -getPredTyDescription (EqPred _ _) = "Type equality" \end{code} diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs index 12624ba2b6..712263a156 100644 --- a/compiler/codeGen/StgCmmClosure.hs +++ b/compiler/codeGen/StgCmmClosure.hs @@ -855,18 +855,12 @@ getTyDescription ty AppTy fun _ -> getTyDescription fun FunTy _ res -> '-' : '>' : fun_result res TyConApp tycon _ -> getOccString tycon - PredTy sty -> getPredTyDescription sty ForAllTy _ ty -> getTyDescription ty } where fun_result (FunTy _ res) = '>' : fun_result res fun_result other = getTyDescription other -getPredTyDescription :: PredType -> String -getPredTyDescription (ClassP cl _) = getOccString cl -getPredTyDescription (IParam ip _) = getOccString (ipNameName ip) -getPredTyDescription (EqPred {}) = "Type equality" - -------------------------------------- -- CmmInfoTable-related things -------------------------------------- |