diff options
| author | David Waern <david.waern@gmail.com> | 2011-11-06 00:01:47 +0100 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2011-11-06 00:01:47 +0100 |
| commit | 2d0c63d4155fde1b5d8f51b66aa2393f265eaa7b (patch) | |
| tree | 074f93a78bd3059e80cbfb1f1cd29aa5b960d340 /src/Haddock/Interface/Create.hs | |
| parent | 0a8d2696f88e0308fd689475ce2896b6ba014694 (diff) | |
| parent | 2deba11b49ed5ca29e947e875349f870310d3746 (diff) | |
Merge branch 'master' of http://darcs.haskell.org/haddock
Diffstat (limited to 'src/Haddock/Interface/Create.hs')
| -rw-r--r-- | src/Haddock/Interface/Create.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs index f9d72bd0..057fceb7 100644 --- a/src/Haddock/Interface/Create.hs +++ b/src/Haddock/Interface/Create.hs @@ -263,7 +263,7 @@ declsFromClass class_ = docs ++ defs ++ sigs ++ ats declNames :: HsDecl a -> [a] declNames (TyClD d) = [tcdName d] -declNames (ForD (ForeignImport n _ _)) = [unLoc n] +declNames (ForD (ForeignImport n _ _ _)) = [unLoc n] -- we have normal sigs only (since they are taken from ValBindsOut) declNames (SigD sig) = sigNameNoLoc sig declNames _ = error "unexpected argument to declNames" @@ -770,7 +770,7 @@ extractClassDecl c tvs0 (L pos (TypeSig lname ltype)) = case ltype of _ -> L pos (TypeSig lname (noLoc (mkImplicitHsForAllTy (lctxt []) ltype))) where lctxt = noLoc . ctxt - ctxt preds = noLoc (HsClassP c (map toTypeNoLoc tvs0)) : preds + ctxt preds = nlHsTyConApp c (map toTypeNoLoc tvs0) : preds extractClassDecl _ _ _ = error "extractClassDecl: unexpected decl" |