Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch
http://hackage.haskell.org/trac/ghc/changeset/def6b5b42b0c788d4506225ea5af00680391a659 >--------------------------------------------------------------- commit def6b5b42b0c788d4506225ea5af00680391a659 Author: Thijs Alkemade <[email protected]> Date: Wed Feb 29 12:19:20 2012 +0100 Fix merge errors. >--------------------------------------------------------------- compiler/prelude/TysWiredIn.lhs | 3 ++- compiler/typecheck/TcCanonical.lhs | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/compiler/prelude/TysWiredIn.lhs b/compiler/prelude/TysWiredIn.lhs index e34f87c..15e4f26 100644 --- a/compiler/prelude/TysWiredIn.lhs +++ b/compiler/prelude/TysWiredIn.lhs @@ -96,7 +96,7 @@ import TyCon import TypeRep import RdrName import Name -import BasicTypes ( TupleSort(..), tupleSortBoxity, IPName(..), HoleName(..) +import BasicTypes ( TupleSort(..), tupleSortBoxity, IPName(..), HoleName(..), Arity, RecFlag(..), Boxity(..), HsBang(..) ) import ForeignCall import Unique ( incrUnique, mkTupleTyConUnique, @@ -438,6 +438,7 @@ mkHoleName ip tycon_u datacon_u dc_wrk_u co_ax_u = name_hole tycon = mkAlgTyCon tycon_name (liftedTypeKind `mkArrowKind` constraintKind) [alphaTyVar] + Nothing [] -- No stupid theta (NewTyCon { data_con = datacon, nt_rhs = mkTyVarTy alphaTyVar, diff --git a/compiler/typecheck/TcCanonical.lhs b/compiler/typecheck/TcCanonical.lhs index d840627..ae057bd 100644 --- a/compiler/typecheck/TcCanonical.lhs +++ b/compiler/typecheck/TcCanonical.lhs @@ -304,6 +304,7 @@ constraint between the types. (On the other hand, the types in two class constraints for the same class MAY be equal, so they need to be flattened in the first place to facilitate comparing them.) +\begin{code} canHole :: SubGoalDepth -- Depth -> CtFlavor -> EvVar -> HoleName Name -> Type -> TcS StopOrContinue @@ -321,6 +322,7 @@ canHole d fl v nm ty else error "false" } +\end{code} %************************************************************************ %* * _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
