Repository : ssh://darcs.haskell.org//srv/darcs/haddock On branch : master
http://hackage.haskell.org/trac/ghc/changeset/2760e0baecf9c747a977c7f3b8a47ea95acb7824 >--------------------------------------------------------------- commit 2760e0baecf9c747a977c7f3b8a47ea95acb7824 Author: David Waern <[email protected]> Date: Sat Nov 26 19:56:21 2011 +0100 Update tests. >--------------------------------------------------------------- tests/html-tests/tests/A.hs | 6 +++ tests/html-tests/tests/A.html.ref | 16 +++++++ tests/html-tests/tests/B.hs | 9 +++- tests/html-tests/tests/B.html.ref | 52 ++++++++++++++++++++++ tests/html-tests/tests/CrossPackageDocs.html.ref | 8 +++- 5 files changed, 87 insertions(+), 4 deletions(-) diff --git a/tests/html-tests/tests/A.hs b/tests/html-tests/tests/A.hs index 4a344a2..ac8fad4 100644 --- a/tests/html-tests/tests/A.hs +++ b/tests/html-tests/tests/A.hs @@ -1,2 +1,8 @@ module A where data A = A + +other :: Int +other = 2 + +test2 :: Bool +test2 = False diff --git a/tests/html-tests/tests/A.html.ref b/tests/html-tests/tests/A.html.ref index cb25ba9..63d56c3 100644 --- a/tests/html-tests/tests/A.html.ref +++ b/tests/html-tests/tests/A.html.ref @@ -66,6 +66,22 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");}; ></table ></div ></div + ><div class="top" + ><p class="src" + ><a name="v:other" class="def" + >other</a + > :: <a href="" + >Int</a + ></p + ></div + ><div class="top" + ><p class="src" + ><a name="v:test2" class="def" + >test2</a + > :: <a href="" + >Bool</a + ></p + ></div ></div ></div ><div id="footer" diff --git a/tests/html-tests/tests/B.hs b/tests/html-tests/tests/B.hs index 3a31507..38310eb 100644 --- a/tests/html-tests/tests/B.hs +++ b/tests/html-tests/tests/B.hs @@ -1,2 +1,7 @@ -module B ( module A ) where -import A +module B ( module A, test ) where +import A ( A(..), test2 ) + +-- | This link shouldn't work: 'other'. +-- These links should work: 'A.other', 'Data.List.sortBy', 'test2', 'A.test2', 'Data.Maybe.fromMaybe'. +test :: Int +test = 1 diff --git a/tests/html-tests/tests/B.html.ref b/tests/html-tests/tests/B.html.ref index bbb67c2..f81460e 100644 --- a/tests/html-tests/tests/B.html.ref +++ b/tests/html-tests/tests/B.html.ref @@ -41,6 +41,22 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");}; ><p class="caption" >B</p ></div + ><div id="synopsis" + ><p id="control.syn" class="caption expander" onclick="toggleSection('syn')" + >Synopsis</p + ><ul id="section.syn" class="hide" onclick="toggleSection('syn')" + ><li class="src short" + >module <a href="" + >A</a + ></li + ><li class="src short" + ><a href="" + >test</a + > :: <a href="" + >Int</a + ></li + ></ul + ></div ><div id="interface" ><h1 >Documentation</h1 @@ -50,6 +66,42 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");}; >A</a ></p ></div + ><div class="top" + ><p class="src" + ><a name="v:test" class="def" + >test</a + > :: <a href="" + >Int</a + ></p + ><div class="doc" + ><p + >This link shouldn't work: <code + >other</code + >. + These links should work: <code + ><a href="" + >other</a + ></code + >, <code + ><a href="" + >sortBy</a + ></code + >, <code + ><a href="" + >test2</a + ></code + >, <code + ><a href="" + >test2</a + ></code + >, <code + ><a href="" + >fromMaybe</a + ></code + >. +</p + ></div + ></div ></div ></div ><div id="footer" diff --git a/tests/html-tests/tests/CrossPackageDocs.html.ref b/tests/html-tests/tests/CrossPackageDocs.html.ref index 6d6903a..d339101 100644 --- a/tests/html-tests/tests/CrossPackageDocs.html.ref +++ b/tests/html-tests/tests/CrossPackageDocs.html.ref @@ -209,9 +209,13 @@ monadic expressions. >Monad</a ></code > for lists, <code - >Data.Maybe.Maybe</code + ><a href="" + >Maybe</a + ></code > and <code - >System.IO.IO</code + ><a href="" + >IO</a + ></code > defined in the <a href="" >Prelude</a _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
