[commit: ghc] overlapping-tyfams: Revert "Checkpoint during compilation." (c26be08)
Richard Eisenberg
eir at cis.upenn.edu
Fri Jun 21 15:16:39 CEST 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : overlapping-tyfams
https://github.com/ghc/ghc/commit/c26be08347b92071ac59c1278cb8c27743cc125a
>---------------------------------------------------------------
commit c26be08347b92071ac59c1278cb8c27743cc125a
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date: Tue Jun 11 18:56:39 2013 +0100
Revert "Checkpoint during compilation."
This reverts commit 0276b4966bd1ec50c7236cdc9d480873f0c33b2b.
>---------------------------------------------------------------
compiler/parser/Parser.y.pp | 2 +-
compiler/types/CoAxiom.lhs | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 67a02d1..0541f21 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -679,7 +679,7 @@ inst_decl :: { LInstDecl RdrName }
| 'type' 'instance' maybe_type_space 'where' ty_fam_inst_eqn_list
{% do { L loc tfi <- mkTyFamInstGroup (comb2 $1 $5)
(unLoc $3) (unLoc $5)
- ; return (L loc (TyFamInstD { tfid_inst = tfi })) } }
+ ; return (L loc (TyFamInstD ( tfid_inst = tfi })) } }
-- data/newtype instance declaration
| data_or_newtype 'instance' tycl_hdr constrs deriving
diff --git a/compiler/types/CoAxiom.lhs b/compiler/types/CoAxiom.lhs
index f11190e..4a2820f 100644
--- a/compiler/types/CoAxiom.lhs
+++ b/compiler/types/CoAxiom.lhs
@@ -11,7 +11,6 @@
module CoAxiom (
Branched, Unbranched, BranchFlag(..), BranchIndex, BranchList(..),
- isBranched,
toBranchList, fromBranchList,
toBranchedList, toUnbranchedList,
brListLength, brListNth, brListMap, brListFoldr,
More information about the ghc-commits
mailing list