X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcInstDcls.lhs;h=468d9a9015bd6fe7fabadda234ebae7d7b889f27;hb=e4137764fddd9003f1d2a234de7b2fc076be335d;hp=880a0eee075d212d4b59bb2128886cf164de8c48;hpb=e6d057711f4d6d6ff6342c39fa2b9e44d25447f1;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcInstDcls.lhs b/compiler/typecheck/TcInstDcls.lhs
index 880a0ee..468d9a9 100644
--- a/compiler/typecheck/TcInstDcls.lhs
+++ b/compiler/typecheck/TcInstDcls.lhs
@@ -146,12 +146,13 @@ Gather up the instance declarations from their various sources
 tcInstDecls1	-- Deal with both source-code and imported instance decls
    :: [LTyClDecl Name]		-- For deriving stuff
    -> [LInstDecl Name]		-- Source code instance decls
+   -> [LDerivDecl Name]		-- Source code stand-alone deriving decls
    -> TcM (TcGblEnv,		-- The full inst env
 	   [InstInfo],		-- Source-code instance decls to process; 
 				-- contains all dfuns for this module
 	   HsValBinds Name)	-- Supporting bindings for derived instances
 
-tcInstDecls1 tycl_decls inst_decls
+tcInstDecls1 tycl_decls inst_decls deriv_decls
   = checkNoErrs $
     do {        -- Stop if addInstInfos etc discovers any errors
 		-- (they recover, so that we get more than one error each
@@ -190,7 +191,7 @@ tcInstDecls1 tycl_decls inst_decls
 	        -- (4) Compute instances from "deriving" clauses; 
 		-- This stuff computes a context for the derived instance
 		-- decl, so it needs to know about all the instances possible
-       ; (deriv_inst_info, deriv_binds) <- tcDeriving tycl_decls
+       ; (deriv_inst_info, deriv_binds) <- tcDeriving tycl_decls deriv_decls
        ; addInsts deriv_inst_info   $ do {
 
        ; gbl_env <- getGblEnv