[commit: ghc] overlapping-tyfams: Checkpoint during compilation. (0276b49)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/0276b4966bd1ec50c7236cdc9d480873f0c33b2b

>---------------------------------------------------------------

commit 0276b4966bd1ec50c7236cdc9d480873f0c33b2b
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Mon May 27 21:33:33 2013 +0100

    Checkpoint during compilation.

>---------------------------------------------------------------

 compiler/parser/Parser.y.pp | 2 +-
 compiler/types/CoAxiom.lhs  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 0541f21..67a02d1 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 4a2820f..f11190e 100644
--- a/compiler/types/CoAxiom.lhs
+++ b/compiler/types/CoAxiom.lhs
@@ -11,6 +11,7 @@
 
 module CoAxiom (
        Branched, Unbranched, BranchFlag(..), BranchIndex, BranchList(..),
+       isBranched,
        toBranchList, fromBranchList,
        toBranchedList, toUnbranchedList,
        brListLength, brListNth, brListMap, brListFoldr,