Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 16:40:13 +0000 (16:40 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 16:40:13 +0000 (16:40 +0000)
1  2 
compiler/basicTypes/MkId.lhs
compiler/coreSyn/CoreLint.lhs
compiler/coreSyn/CoreSubst.lhs
compiler/deSugar/DsBinds.lhs
compiler/main/DynFlags.hs
compiler/simplCore/Simplify.lhs
compiler/typecheck/TcDeriv.lhs

Simple merge
Simple merge
@@@ -1193,10 -1192,10 +1193,10 @@@ exprIsConApp_maybe id_unf exp
          -- Look through dictionary functions; see Note [Unfolding DFuns]
          | DFunUnfolding dfun_nargs con ops <- unfolding
          , length args == dfun_nargs    -- See Note [DFun arity check]
-         , let (dfun_tvs, _n_theta, _cls, dfun_res_tys) = tcSplitDFunTy (idType fun)
+         , let (dfun_tvs, _theta, _cls, dfun_res_tys) = tcSplitDFunTy (idType fun)
                subst    = zipOpenTvSubst dfun_tvs (stripTypeArgs (takeList dfun_tvs args))
                mk_arg (DFunPolyArg e) = mkApps e args
 -              mk_arg (DFunLamArg i)  = args !! i
 +              mk_arg (DFunLamArg i)  = getNth args i
          = dealWithCoercion co (con, substTys subst dfun_res_tys, map mk_arg ops)
  
          -- Look through unfoldings, but only arity-zero one; 
Simple merge
Simple merge
Simple merge
Simple merge